3.6修改

src/views/ccgl/ckgl/bldj/top/index.vue

@@ -79,7 +79,7 @@
             //   }
             // },
             {
-            	title: "维护人",
+            	title: "责任人",
             	field: "zrrName",
               width:160
             },

src/views/ccgl/ckgl/ckd/top/kc.vue

@@ -122,7 +122,8 @@
 
       	],
       	queryParams: [
-      		[{
+      		[
+            {
       				label: '物料信息',
       				prop: 'wlinfo',
       				span: 6,
@@ -142,7 +143,21 @@
       						"label": "name"
       					}
       				}
-      			}
+      			},
+            {
+            	label: '容器编码',
+            	prop: 'rqCode',
+            	span: 6,
+            	type: 'input',
+            	value: ''
+            },
+            {
+            	label: '托盘编码',
+            	prop: 'tpCode',
+            	span: 6,
+            	type: 'input',
+            	value: ''
+            },
 
       		]
       	],

src/views/ccgl/rkgl/rkd/top/edit.vue

@@ -259,7 +259,7 @@
             prop: 'hzid',
             span: 8,
             type: 'AuxInput',
-            // required: true,
+            required: true,
             typeConfig: {
               isRequest: true,
               code: 'HZID',

src/views/ccgl/rkgl/sjrw/top/edit.vue

@@ -11,9 +11,9 @@
       </el-row>
 
       <div class="editTab">
-        <editTableForEdit  :AuxButton='false' :indexApp='app' :type='type' ref="editTableForEdit"
-          :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
-          :editTableData="formDetail" >
+        <editTableForEdit :expandTitle='false' :phsxTitle='false' :AuxButton='false' :indexApp='app' :type='type'
+          ref="editTableForEdit" :editTableTitle='editTableTitle' v-if="editTableForEdit" :computedRow='computedRow'
+          :editTableData="formDetail">
           <template v-if="type!='view'" #toolbar="ctx">
             <el-button @click="xzrkqd" size="mini" style="display: inline-block;margin-right: 10px;"
               type="primary">选择入库清单</el-button>
@@ -23,8 +23,7 @@
       <el-row :gutter="20" :app="this" class="editRow bottomInfo">
         <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
           v-for="(item,index) in editColItemList2 " :value="item.value" :span="item.span" :label="item.label"
-      		:prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig'
-      		:rule="item.rule" />
+          :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
         <!-- 额外数据 -->
       </el-row>
     </el-form>
@@ -33,7 +32,6 @@
   </RelDialog>
 </template>
 <script>
-
   import {
     toFixed,
     doRkdChange
@@ -45,7 +43,7 @@
   import Xzrkqd from './xzrkqd.vue'
   export default {
     mixins: [editMixin, editMixin_expand],
-    components:{
+    components: {
       Xzrkqd
     },
     mounted() {
@@ -53,51 +51,54 @@
       // this.form.sjrid=this.userid
     },
     methods: {
-       getFormDetail(){
-            	if(this.type!='add'){
+      getFormDetail() {
+        if (this.type != 'add') {
           /* 1.@getFormDetail='getFormDetail' 存在触发时生效 */
           /* 2.适配 EditTableForEdit 组件*/
           /* 当编辑页面打开不是add时查询从表 主动赋值 */
-            		this.$refs.editTableForEdit.editTableConfig['editTableData']=this.formDetail||[]
+          this.$refs.editTableForEdit.editTableConfig['editTableData'] = this.formDetail || []
         }
-              if(this.type=='copy'){
-                this.formDetail.forEach(item=>item.kwid='')
+        if (this.type == 'copy') {
+          this.formDetail.forEach(item => item.kwid = '')
         }
       },
-      xzrkqdSave(obj){
-        let {list,row}=obj
-        if(list&&list[0]&&list[0].kqid){
-          this.form.kqid=list[0].kqid
+      xzrkqdSave(obj) {
+        let {
+          list,
+          row
+        } = obj
+        if (list && list[0] && list[0].kqid) {
+          this.form.kqid = list[0].kqid
         }
-        this.form.swlxid=row.swlxid
-        this.form.lydjid=row.id
-        this.form.ckid=row.ckid
-        this.form.rktzDjid=row.djid
-        this.form.hzid=row.hzid
-        this.form.hzName=row.hzName
+        this.form.swlxid = row.swlxid
+        this.form.lydjid = row.id
+        this.form.ckid = row.ckid
+        this.form.rktzDjid = row.djid
+        this.form.hzid = row.hzid
+        this.form.hzName = row.hzName
         // this.form.ywrq=row.ywrq
         let length = this.formDetail.length
         this.formDetail.splice(0, length)
         list.forEach(item => {
           item.lydjid = item.id
-          item.sjsl=item.yssl
+          item.sjsl = item.yssl
           delete item.id
           this.formDetail.push(_.cloneDeep(item))
         })
         // 回填上架人
-        this.$post('lxyl/rkgl/sjtz/default/sjr',{
-          ckid:row.ckid,
-          hzid:list[0].hzid,
-          wlid:list[0].wlid,
-        }).then(res=>{
-          if(res.success){
-            this.form.sjrName=res.data.records.username
-             this.form.sjrid=res.data.records.id
+        this.$post('lxyl/rkgl/sjtz/default/sjr', {
+          ckid: row.ckid,
+          hzid: list[0].hzid,
+          wlid: list[0].wlid,
+        }).then(res => {
+          if (res.success) {
+            this.form.sjrName = res.data.records.username
+            this.form.sjrid = res.data.records.id
           }
         })
       },
-      xzrkqd(){
-      this.showDialog=true
+      xzrkqd() {
+        this.showDialog = true
       },
       /* 需要整体row时的回调 */
       computedRow(row) {
@@ -108,14 +109,13 @@
     },
     data() {
       return {
-        editColItemList2:[
-          {
+        editColItemList2: [{
             "label": "状态",
             "prop": "zt",
             "span": 8,
             "type": "RelSelect",
             "value": "",
-            readonly:true,
+            readonly: true,
             "typeConfig": {
               "src": "wms/rkgl/sjtz/init/zt",
               "match": {
@@ -129,7 +129,7 @@
             prop: 'whr',
             type: 'input',
             span: 8,
-            readonly:true,
+            readonly: true,
           },
 
           {
@@ -137,8 +137,8 @@
             prop: 'whsj',
             span: 8,
             type: 'datetime',
-             readonly:true,
-             value:new Date().getTime()
+            readonly: true,
+            value: new Date().getTime()
           }
         ],
         /* dialog*/
@@ -161,6 +161,7 @@
             "span": 8,
             "type": "RelSelect",
             "value": "",
+            readonly:(this.type=='edit'||this.type=='view')?true:false,
             "required": true,
             "typeConfig": {
               "src": "jcsj/common/ck/queryCkid",
@@ -176,6 +177,7 @@
             "span": 8,
             "type": "RelSelect",
             "value": "",
+             readonly:(this.type=='edit'||this.type=='view')?true:false,
             // "required": true,
             "typeConfig": {
               "src": "wms/jcsj/kq/query",
@@ -194,6 +196,7 @@
             "type": "RelSelect",
             "value": "",
             "required": true,
+             readonly:(this.type=='edit'||this.type=='view')?true:false,
             "typeConfig": {
               "src": "wms/rkgl/sjtz/init/swlx",
               "match": {
@@ -246,6 +249,7 @@
             prop: 'hzid',
             span: 8,
             type: 'AuxInput',
+             readonly:(this.type=='edit'||this.type=='view')?true:false,
             typeConfig: {
               isRequest: true,
               code: 'HZID',
@@ -259,8 +263,9 @@
           {
             label: '来源单据',
             prop: 'rktzDjid',
+             readonly:(this.type=='edit'||this.type=='view')?true:false,
             span: 8,
-                   readonly:true,
+            readonly: true,
             type: 'input',
           },
           // {