113 debug

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

@@ -4,7 +4,7 @@
     <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
       <el-row :gutter="20" :app="this" class="editRow">
         <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
-          v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
+          v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label" v-if="(item.show==false)?false:true"
           :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
         <!-- 额外数据 -->
       </el-row>
@@ -193,10 +193,18 @@
               }
             }
           },
+          {
+              label: '供应商',
+              prop: 'gysid',
+              span: 8,
+              type: 'input',
+              readonly:true,
+              show:this.type=='view'?true:false
+            },
           {
             label: '备注',
             prop: 'bz',
-            span: 24,
+            span: this.type=='view'?16:24,
             type: 'input',
           },
 

src/views/ccgl/rkgl/rkdj/index.vue

@@ -49,7 +49,7 @@
                                 },
 						                    {title: "部门", field: "bmName", width: 130},
 						                    {title: "入库人", field: "jsr", width: 120},
-                                {title: "来源单号", field: "lydjCode", width: 120},
+                                // {title: "来源单号", field: "lydjCode", width: 120},
 						                    {title: "保管员", field: "bgy", width: 120},
 						                    {title: "入库单号", field: "lydjid", width: 140,
                                   formatter(a, b, c) {
@@ -93,7 +93,7 @@
 							},
               {
               	label: '来源单号',
-              	prop: 'lydh',
+              	prop: 'sjtzDjid',
               	span: 4,
               	type: 'input',
               	value: ''

src/views/ccgl/rkgl/sjrw/mx.vue

@@ -36,7 +36,18 @@
           /* 基本配置*/
           url: 'wms/rkgl/sjtz',
           queryUrl: 'wms/rkgl/sjtz/query/detail',
-          tableTitle: [{
+          tableTitle: [
+            {
+              title: "状态",
+              field: "zt",
+              width: 100,
+              "transform": {
+              	"url": "wms/rkgl/sjtz/init/zt",
+              	"label": "name",
+              	"value": "id"
+              }
+            },
+            {
               title: "物料编码",
               field: "wlxxCode",
               fieldType: "upper",
@@ -92,25 +103,16 @@
               field: "sjsl",
               width: 100,
             },
-            {
-              title: "入库数量",
-              field: "rksl",
-              width: 100,
-            }, {
-              title: "过账数量",
-              field: "gzsl",
-              width: 100,
-            },
-            {
-              title: "状态",
-              field: "zt",
-              width: 100,
-              "transform": {
-              	"url": "wms/rkgl/sjtz/init/zt",
-              	"label": "name",
-              	"value": "id"
-              }
-            }
+            // {
+            //   title: "入库数量",
+            //   field: "rksl",
+            //   width: 100,
+            // }, {
+            //   title: "过账数量",
+            //   field: "gzsl",
+            //   width: 100,
+            // },
+           
           ],
           queryParams: [],
 

src/views/ccgl/rkgl/sjrw/sjhz.vue

@@ -65,6 +65,11 @@
               field: "kwName",
               width: 140
             },
+            {
+              title: "实际库位",
+              field: "sjkwName",
+              width: 140
+            },
             {
               title: "状态",
               field: "zt",

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

@@ -68,7 +68,17 @@
           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
+          }
+        })
       },
       xzrkqd(){
       this.showDialog=true
@@ -181,23 +191,23 @@
             value: new Date().getTime(),
             "required": true,
           },
-          // {
-          //   label: '上架人',
-          //   prop: 'sjrid',
-          //   span: 8,
-          //   "required": true,
-          //   type: 'AuxInput',
-          //   typeConfig: {
-          //   	code: 'USER',
-          //   	label: 'sjrName',
-          //   	transform: {
-          //   		value: 'id',
-          //   		label: 'username'
-          //   	}
+          {
+            label: '上架人',
+            prop: 'sjrid',
+            span: 8,
+            "required": true,
+            type: 'AuxInput',
+            typeConfig: {
+            	code: 'USER',
+            	label: 'sjrName',
+            	transform: {
+            		value: 'id',
+            		label: 'username'
+            	}
 
-          //   },
+            },
 
-          // },
+          },
           // {
           // 	label: '单据来源',
           // 	prop: 'djlyName',

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

@@ -39,7 +39,7 @@
         config: {
           /* 基本配置*/
           url: 'wms/rkgl/rktz',
-          queryUrl: 'wms/rkgl/sjtz/query/rktzqd',
+          queryUrl: 'lxyl/rkgl/sjtz/query/rktzqd',
           tableTitle: [{
               title: "物料编码",
               field: "wlxxCode",
@@ -61,6 +61,11 @@
                   field: "wlph",
                   width: 180
                 },
+              {
+                  title: "物料组",
+                  field: "wlzName",
+                  width: 180
+                },
               {
               	title: "制令号",
               	field: "zlh",

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

@@ -59,8 +59,23 @@
            list:list,
            row:this.row
          }
+        /* 判定list wlid是否重复*/
+        let wlzList=list.map(item=>item.wlxxWlzid)
+        wlzList=[...new Set(wlzList)]
+        if(wlzList.length>1){
+          this.$confirm('选择的物料组不唯一，系统随机其中一个物料组的仓管员，是否确认?', '提示', {
+          					confirmButtonText: '确定',
+          					cancelButtonText: '取消',
+          					type: 'warning'
+          				}).then(res=>{
           					this.$emit('save',obj)
           					this.app.showDialog=false
+          				})
+        }else{
+          this.$emit('save',obj)
+          this.app.showDialog=false
+        }
+
        }
         // if()
       },