仓库模块内容修改

src/App.vue

@@ -36,6 +36,11 @@ body,
   margin-bottom: 0px !important;
 }
 
+.el-button--text{
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
+
 .el-dialog{
     min-height: 180px;
     border-radius: 2px;

src/views/inboundOutboundManagement/components/addEditDialog.vue

@@ -18,7 +18,7 @@
 
                 <el-col :span="8">
                     <el-form-item label="入库仓库:" prop="shId">
-                        <el-select v-model="ruleForm.shId" placeholder="请选择" >
+                        <el-select v-model="ruleForm.shId" placeholder="请选择" @change="changeWarehouse">
                             <el-option v-for="item in warehouseList" :key="item.id" :label="item.shName" :value="item.id"></el-option>
                         </el-select>
                     </el-form-item>
@@ -235,6 +235,29 @@ export default {
                 this.goodsList = res.data.data.records
             })
         },
+        // 切换仓库
+        changeWarehouse(val){
+            if(this.tableData.length > 0){
+                if(this.tableData.length == 1){
+                    this.tableData[0].slId = ''
+                    getLocationList({
+                        shId:this.ruleForm.shId,
+                        goodsCode:this.tableData[0].goodsCode
+                    }).then(res =>{
+                        this.tableData[0].locationList = res.data.data
+                    })
+                }else{
+                    this.tableData.map(item =>{
+                        item.goodsCode = ''
+                        item.goodsName = ''
+                        item.goodsId = ''
+                        item.materialModel = ''
+                        item.slId = ''
+                    })
+                }
+            }
+            
+        },
         // 切换物料
         changeGoods(val,index){
             let tmp = this.goodsList.find(item => item.goodsCode == val)
@@ -245,7 +268,6 @@ export default {
                 shId:this.ruleForm.shId,
                 goodsCode:val
             }).then(res =>{
-                console.log('res--------',res)
                 this.tableData[index].locationList = res.data.data
             })
         },

src/views/inboundOutboundManagement/otherReceiving.vue

@@ -222,6 +222,9 @@ export default {
                     {
                         label: '到期日期',
                         prop: 'scrapCycle',
+                        type:'date',
+                        format:'YYYY-MM-DD',
+                        valueFormat:'YYYY-MM-DD',
                         span: 8,
                         overflow: true,
                         search: false,

src/views/inboundOutboundManagement/returnReceiving.vue

@@ -292,6 +292,10 @@ export default {
               },
             ],
           },
+          {
+            label:"到期日期",
+            prop:"validdat",
+          },
           {
             label: '检验编号',
             prop: 'qutno',

src/views/inboundOutboundManagement/warehouseTransfer/index.vue

@@ -268,6 +268,11 @@ export default {
             search: false,
             width: 120,
           },
+          {
+            label: "到期日期",
+            prop: "scrapCycle",
+            width: 120,
+          }
         ],
       },
       form: {},

src/views/warehouseManagement/materialMaintenance.vue

@@ -166,19 +166,25 @@ export default {
                     },
                     {
                         label: '物料类别',
-                        prop: 'coGoodsClass',
+                        prop: 'gcId',
                         span: 12,
-                        editDisplay: false,
+                        type:"select",
+                        // editDisplay: false,
                         overflow: true,
                         search: false,
                         width: 200,
                         rules: [
                             {
-                                required: true,
+                                required: false,
                                 message: '请输入物料类别',
                                 trigger: 'blur',
                             },
                         ],
+                        dicUrl:"/api/blade-wms/stGoodsClass/findGoodsClass",
+                        props:{
+                            label: 'gcName',
+                            value: 'id'
+                        }
                     },
                     {
                         label: '是否工艺审批',
@@ -200,6 +206,54 @@ export default {
                         //     },
                         // ],
                     },
+                    {
+                        label: '补制类型',
+                        prop: 'reissueType',
+                        type: 'select',
+                        dicData: [
+                            // /**
+                            // * 补制类型 - 无
+                            // */
+                            // public static Short REISSUE_TYPE_NONE = 0;
+
+                            // /**
+                            //  * 补制类型 - 物料出库
+                            //  */
+                            // public static Short REISSUE_TYPE_GOODS_OUT = 1;
+
+                            // /**
+                            //  * 补制类型 - 最低库存
+                            //  */
+                            // public static Short REISSUE_TYPE_MIN_STOCK = 2;
+                            {label: '无', value: 0},
+                            {label: '物料出库', value: 1},
+                            {label: '最低库存', value: 2},
+                        ],
+                        span: 12,
+                        overflow: true,
+                        search: false,
+                        width: 200,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择补制类型',
+                                trigger: 'blur',
+                            },
+                        ],
+                        change:val =>{
+                            if(val.value != 0){
+                               let tmp = this.option.column.find(item => item.prop == 'gcId')
+                               tmp.rules[0].required = true
+                               if(val.value == 2){
+                                let tmp = this.option.column.find(item => item.prop == 'minNum')
+                                tmp.rules[0].required = true
+                               }
+                            }else{
+                                let tmp = this.option.column.find(item => item.prop == 'gcId')
+                                tmp.rules[0].required = false
+                            }
+                        }
+                    },
                     {
                         label: '等级',
                         prop: 'grade',
@@ -238,13 +292,13 @@ export default {
                         overflow: true,
                         search: false,
                         width: 200,
-                        // rules: [
+                        rules: [
-                        //     {
+                            {
-                        //         required: true,
+                                required: false,
-                        //         message: '请输入最低库存',
+                                message: '请输入最低库存',
-                        //         trigger: 'blur',
+                                trigger: 'blur',
-                        //     },
+                            },
-                        // ],
+                        ],
                     },
                     
                     {
@@ -300,7 +354,7 @@ export default {
                     // },
                     {
                         label: '版本',
-                        prop: 'releaseno',
+                        prop: 'releaseNo',
                         span: 12,
                         overflow: true,
                         editDisplay: false,
@@ -316,7 +370,7 @@ export default {
                     },
                     {
                         label: '属性',
-                        prop: 'cplb',
+                        prop: 'materialProperty',
                         span: 12,
                         overflow: true,
                         editDisplay: false,
@@ -332,7 +386,7 @@ export default {
                     },
                     {
                         label: '当前库存',
-                        prop: 'curQuantity',
+                        prop: 'currentQuantity',
                         editDisplay: false,
                         span: 12,
                         overflow: true,
@@ -444,8 +498,15 @@ export default {
         },
         beforeOpen(done, type){
             console.log('form-----------------',this.form)
+            if(type == 'edit'){
                 this.form.minWarning = this.form.minWarning != '' ? this.form.minWarning : false
+                this.form.reissueType = (this.form.reissueType && this.form.reissueType != -1) ? this.form.reissueType : 0
+                this.form.gcId = this.form.gcId == -1 ? '' : this.form.gcId
+                done()
+            }else{
                 done()
+            }
+            
         },
         rowUpdate(row, index, done, loading){
             console.log('row----------------',row)