Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -559,7 +559,8 @@ export default {
         },
         // 新增数据
         addData(data) {
-            this.dataModel.unshift(data)
+            // this.dataModel.unshift(data)
+            this.dataModel.push(data)
             // 初始化运行公式计算 unshift
             this.initRunCalFormula(this.dataModel.length - 1)
             // 后置事件

src/components/ibps-crud/index.vue

@@ -328,7 +328,7 @@
               v-if="rowHandle"
               v-bind="rowHandle"
               :label=" handleAttribute(rowHandle.columnHeader,'操作') "
-              :width="handleAttribute(rowHandle.width, rowHandleDefaultWidth) <80 ?  '80' : this.rowHandle.actions.length !=0 && this.rowHandle.actions.length<3  ? 110 * this.rowHandle.actions.length : handleAttribute(rowHandle.width, rowHandleDefaultWidth)"
+              :width="handleAttribute(rowHandle.width, rowHandleDefaultWidth) <80 ?  '80' : this.rowHandle.actions.length !=0 && this.rowHandle.actions.length<=3  ? 80 + 50 * (this.rowHandle.actions.length - 1) : 80"
               :fixed="handleAttribute(rowHandle.fixed, 'right')"
               :align="handleAttribute(rowHandle.align, 'center')"
             >

src/components/ibps-toolbar/index.vue

@@ -34,7 +34,7 @@
         >
           {{ button.label }}
         </el-link>
-        <el-divider v-if="index < actions.length-1" :key="index" direction="vertical" />
+        <el-divider v-if="index !== actions.length - 1" :key="index" direction="vertical" />
       </template>
       <template v-else-if="type==='linkHide'">
         <p>

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -237,8 +237,8 @@
                         // { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 },
                         { prop: 'tYear', label: '年份', width: 60 },
                         { prop: 'tDept', label: '部门', width: 90 },
-                        { prop: 'procDefName', label: '表单名称', width: 220 },
-                        { prop: 'subject', label: '事务说明', formatter: this.getDesc },
+                        { prop: 'procDefName', label: '表单名称', sortable: 'custom', width: 220 },
+                        { prop: 'subject', label: '事务说明', formatter: this.getDesc, 'min-width': 300 },
                         { prop: 'tUser', label: '编制人', width: 80 },
                         { prop: 'endTime', label: '完成时间', sortable: 'custom', dateFormat: 'yyyy-MM-dd', width: 90}
                     ],

src/views/system/jbdHome/board/checkBoard.vue

@@ -289,12 +289,12 @@
                 // 获取已委托样品数量
                 const sql3 = `select count(yp.id_) as unReceive from t_lhypb yp, t_lhwtsqb wt where yp.parent_id_ = wt.id_ and yp.create_time_ like '${this.month}%'`
                 // 获取样品 收样/留样/不合格数量
-                const sql4 = `select count(id_) as receive, count(shi_fou_liu_yang_ = '是' or null) as keep, count(yan_shou_jie_guo_ = '残缺' or null) as incomplete from t_lhypdjb where create_time_ like '${this.month}%'`
+                const sql4 = `select count(a.id_) as receive, count(a.shi_fou_liu_yang_ = '是' or null) as keep, count(a.yan_shou_jie_guo_ = '残缺' or null) as incomplete from (select id_, shi_fou_liu_yang_, yan_shou_jie_guo_ from t_lhypdjb where create_time_ like '${this.month}%' group by yang_ben_bian_hao) as a`
                 Promise.all([
                     curdPost('sql', sql1),
                     curdPost('sql', sql2),
                     curdPost('sql', sql3),
-                    curdPost('sql', sql4),
+                    curdPost('sql', sql4)
                 ]).then(([ res1, res2, res3, res4]) => {
                     this.bottomCardData.flag = false
                     const data1 = res1.variables.data

src/views/system/jbdHome/board/component/middleCard.vue

@@ -21,7 +21,7 @@
                     :config="tableData"
                     style="width: 100%; height: 100%"
                 />
-                <div v-else :class="$style.no_data">暂无数据</div>
+                <div v-else :class="$style.no_data">本月暂无已完成的检测项目数据</div>
             </div>
         </div>
         <dv-decoration-10 :dur="15"/>