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

src/business/platform/org/employee/panel.vue

@@ -222,24 +222,21 @@ export default {
     showTree: {
       handler: function(val, oldVal) {
         this.lazyTree = this.partyType === 'org'
-       /* if (val === false) { */
-          this.listConfig.searchForm.forms = [
-            { prop: 'name', label: '姓名' }
-          ]
-          this.listConfig.columns = [
-            { prop: 'name', label: '姓名'},
-            { prop: 'createTime', label: '创建时间' ,width:200}
-          ]
-        /* } else {
-          this.listConfig.searchForm.forms = [
-            { prop: 'Q^NAME_^SL', label: '姓名', itemWidth: '200' },
-            { prop: 'Q^ACCOUNT_^SL', label: '帐号', itemWidth: '200' }
-          ]
-          this.listConfig.columns = [
-            { prop: 'name', label: '姓名' },
-            { prop: 'status', label: '状态' }
-          ]
-        } */
+        if (val === false) {
+            this.listConfig.searchForm.forms = [
+                { prop: 'name', label: '姓名' }
+            ]
+            this.listConfig.columns = [
+                { prop: 'name', label: '姓名'},
+            ]
+         } else {
+            this.listConfig.searchForm.forms = [
+                { prop: 'Q^NAME_^SL', label: '姓名', itemWidth: '200' }
+            ]
+            this.listConfig.columns = [
+                { prop: 'name', label: '姓名' }
+            ]
+        }
       },
       immediate: true
     },

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

@@ -23,6 +23,7 @@
                :pagination="pagination"
                :selection-row="selection"
                @action-event="handleAction"
+               @sort-change="handleSortChange"
                @pagination-change="handlePaginationChange">
 
       <template slot="wenjinachayue"
@@ -123,7 +124,7 @@ export default {
       },
       paginations: 20,
       page: 1,
-      sorts: {},
+      sorts: {NIAN_DU_: "desc"},
       depth: '', // 分类栏层级
       treeData: [], // 分类栏数据
       guanJian: '',
@@ -151,7 +152,7 @@ export default {
         },
         // 表格字段配置
         columns: [
-          { prop: 'nian_du_', label: '年度', width: 80,dateFormat: 'yyyy' },
+          { prop: 'nian_du_', label: '年度', width: 80, dateFormat: 'yyyy', sortable: 'custom' },
           { prop: 'fen_lei_', label: '记录表单分类', width: 120 },
           { prop: 'biao_dan_ming_che', label: '表单名称', width: 350 },
           { prop: 'shi_wu_shuo_ming_', label: '事务说明', width: 350 },
@@ -216,10 +217,10 @@ export default {
         ) : (
           startTimeWhere ? ' where ' + startTimeWhere : ''
         )
-        let where = nianduWhere?(this.guanJian ? nianduWhere + ` and (biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%')` : nianduWhere):(
-            this.guanJian? ` where biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%'`:''
+        let where = nianduWhere ? (this.guanJian ? nianduWhere + ` and (biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%')` : nianduWhere) : (
+          this.guanJian ? ` where biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%'` : ''
         )
-        let sql = 'select * FROM t_ywyxjlb jl  LEFT JOIN lh_bm_ry ry ON ry.ry_id  = jl.bian_zhi_ren_' + where + ' order by bian_zhi_shi_jian desc'
+        let sql = 'select * FROM t_ywyxjlb jl  LEFT JOIN lh_bm_ry ry ON ry.ry_id  = jl.bian_zhi_ren_' + where + ` order by nian_du_ ${this.sorts.NIAN_DU_}, bian_zhi_shi_jian desc`
         curdPost('sql', sql).then(response => {
           let tableDatas = response.variables.data
           if (tableDatas.length !== 0) {
@@ -271,10 +272,10 @@ export default {
         ) : (
           nianduWhere ? nianduWhere : ``
         )
-        let where = idwhere?(this.guanJian ? idwhere + ` and (biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%')` : idwhere):(
-            this.guanJian? ` where biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%'`:''
+        let where = idwhere ? (this.guanJian ? idwhere + ` and (biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%')` : idwhere) : (
+          this.guanJian ? ` where biao_dan_ming_che like '%${this.guanJian}%' or shi_wu_shuo_ming_ like '%${this.guanJian}%'` : ''
         )
-        let sql = `select * FROM t_ywyxjlb jl  LEFT JOIN lh_bm_ry ry ON ry.ry_id  = jl.bian_zhi_ren_   ` + where + ` order by bian_zhi_shi_jian desc`
+        let sql = `select * FROM t_ywyxjlb jl  LEFT JOIN lh_bm_ry ry ON ry.ry_id  = jl.bian_zhi_ren_   ` + where + ` order by nian_du_ ${this.sorts.NIAN_DU_},bian_zhi_shi_jian desc`
         console.log('22222')
 
         curdPost('sql', sql).then(response => {
@@ -450,7 +451,13 @@ export default {
           break
       }
     },
-
+/**
+     * 处理排序
+     */
+    handleSortChange(sort) {
+      ActionUtils.setSorts(this.sorts, sort)
+      this.loadData()
+    },
     handleNodeClick(typeId, typeName, treeData) {
       this.tableTitle = typeName.name
       this.typeId = typeId

src/views/system/jbdScan/goods/manualConfirmation.vue

@@ -570,7 +570,7 @@
                                 <el-col :span="8">
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
-                                            <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
+                                            <el-input v-model="item.bei_zhu_1_" placeholder="请输入" type="text"
                                                  clearable />
                                         </template>
                                     </el-form-item>

src/views/system/jbdScan/goods/sampleConfirmation.vue

@@ -570,7 +570,7 @@
                                 <el-col :span="8">
                                     <el-form-item label="备注">
                                         <template slot-scope="scope">
-                                            <el-input v-model="item.bei_zhu_" placeholder="请输入" type="text"
+                                            <el-input v-model="item.bei_zhu_1_" placeholder="请输入" type="text"
                                                  clearable />
                                         </template>
                                     </el-form-item>

src/views/system/jbdScan/js/manualConfirmationJS.js

@@ -94,6 +94,7 @@ export default {
                         item.dan_wei_er = item.yang_pin_gui_ge_e ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_e) : ''
                         item.dan_wei_san = item.yang_pin_gui_ge_s ? this.handleSpecificationsToUnit(item.yang_pin_gui_ge_s) : ''
                         item.dan_wei_si = item.yang_pin_gui_si_ ? this.handleSpecificationsToUnit(item.yang_pin_gui_si_) : ''
+
                     })
                     this.listData = temp
                 } else {
@@ -428,7 +429,8 @@ export default {
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
                                 jie_yang_zhuang_t:"已接收",
-                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu
+                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu,
+                                bei_zhu_1_:ypInfoList[yp].bei_zhu_1_
                             }
                         }
                         sampleList.push(o)
@@ -611,7 +613,7 @@ export default {
                                                 nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
                                                 yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                 shou_yang_ri_qi_: currentTime,
-                                                bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
                                                 yang_ben_lei_xing: yblx,
                                                 yun_shu_tiao_jian: ystj,
                                                 yang_pin_shu_lian: ypsl,

src/views/system/jbdScan/js/sampleConfirmationJS.js

@@ -349,7 +349,8 @@ export default {
                                 yang_pin_gui_si_: ypInfoList[yp].yang_pin_gui_si_,
 
                                 jie_yang_zhuang_t:"已接收",
-                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu
+                                yang_pin_zong_shu:ypInfoList[yp].yang_pin_zong_shu,
+                                bei_zhu_1_:ypInfoList[yp].bei_zhu_1_
                             }
                         }
                         sampleList.push(o)
@@ -532,7 +533,7 @@ export default {
                                                 nian_ling_: ypInfoList[index].nian_ling_=== undefined?'':ypInfoList[index].nian_ling_,
                                                 yang_ben_zhuang_t: item.yang_pin_zhuang_t,
                                                 shou_yang_ri_qi_: currentTime,
-                                                bei_zhu_: ypInfoList[index].bei_zhu_ === undefined?'':ypInfoList[index].bei_zhu_,
+                                                bei_zhu_: ypInfoList[index].bei_zhu_1_ === undefined?'':ypInfoList[index].bei_zhu_1_,
                                                 yang_ben_lei_xing: yblx,
                                                 yun_shu_tiao_jian: ystj,
                                                 yang_pin_shu_lian: ypsl,