Merge branch 'master' of git.echepei.com:wengyuwen/anpinjingyuan-ui

src/views/warehouse/inStock/index.vue

@@ -176,7 +176,10 @@ export default {
         fFeeid:[],
         fFeeunitid:[],
         fStltypeid:[],
-        fWarehouseid:[]
+        fWarehouseid:[],
+        fUnits:[],
+        fStoreenv:[],
+        fIsfilles:[{ label:'有',value:0, }, { label:'无', value:1, }],
       },
       selection:[],
       isItHidden:true,
@@ -476,8 +479,73 @@ export default {
           changeable: 1,
           data:[],
           disabled:false
-        },{
+        },
+        {
           surface: "9",
+          label: "fProductdate",
+          name: "生产日期",
+          checked: 0,
+          width: 100,
+          operation:2,
+          changeable: 3,
+          data:[],
+          disabled:false
+        },{
+          surface: "10",
+          label: "fLotno",
+          name: "批号",
+          checked: 0,
+          width: 100,
+          operation:2,
+          changeable: 2,
+          data:[],
+          disabled:false
+        },
+        {
+          surface: "11",
+          label: "fValid",
+          name: "保值期限",
+          checked: 0,
+          width: 100,
+          operation:2,
+          changeable: 2,
+          data:[],
+          disabled:false
+        },
+        {
+          surface: "12",
+          label: "fUnits",
+          name: "浮点单位",
+          checked: 0,
+          width: 100,
+          operation:2,
+          changeable: 1,
+          data:[],
+          disabled:false
+        },
+        {
+          surface: "13",
+          label: "fStoreenv",
+          name: "存储环境",
+          checked: 0,
+          width: 100,
+          operation:2,
+          changeable: 1,
+          data:[],
+          disabled:false
+        },
+        {
+          surface: "14",
+          label: "fIsfilles",
+          name: "索证索票",
+          checked: 0,
+          width: 100,
+          operation:2,
+          changeable: 1,
+          disabled:false
+        },
+        {
+          surface: "15",
           label: "remark",
           name: "备注",
           checked: 0,
@@ -486,7 +554,7 @@ export default {
           changeable: 2,
           disabled:false
         },{
-          surface: "10",
+          surface: "16",
           label: "fReviewDate",
           name: "审核日期",
           checked: 0,
@@ -497,7 +565,7 @@ export default {
           doNot:'1'
         },
         {
-          surface: "11",
+          surface: "17",
           label: "createBy",
           name: "申请人",
           checked: 0,
@@ -507,7 +575,7 @@ export default {
           disabled:true,
           doNot:'1'
         },{
-          surface: "12",
+          surface: "18",
           label: "fMaterial10",
           name: "操作",
           checked: 0,
@@ -558,6 +626,18 @@ export default {
         {
           index:'4',
           span:6,
+          label: 'fStorekeeper',
+          name:"采购人",
+          form:1,
+          width:200,
+          labelSize:'80',
+          rules:{ required: true, message: ' ', trigger: 'blur' },
+          data:[],
+          disabled:false
+        },
+        {
+          index:'5',
+          span:6,
           label: 'fWarehouseid',
           name:"仓库",
           form:1,
@@ -567,7 +647,7 @@ export default {
           data:[],
           disabled:false
         }, {
-          index:'5',
+          index:'6',
           span:6,
           label: 'fSbu',
           name:"付款单位",
@@ -579,7 +659,7 @@ export default {
           disabled:false
         },
         {
-          index:'6',
+          index:'7',
           span:6,
           label: 'fBsdate',
           name:"入库日期",
@@ -590,7 +670,7 @@ export default {
           disabled:false
         },
         {
-          index:'7',
+          index:'8',
           span:6,
           label: 'remark',
           name:"备注",
@@ -614,6 +694,7 @@ export default {
           size:'mini',
           icon:'el-icon-edit',
           name:'修改',
+          res:0,
           disabled:true
         },{
           type:'info',
@@ -867,6 +948,28 @@ export default {
           }
         }
       })
+      //获取浮点单位字典表
+      this.getDicts('f_floatunit').then((response) => {
+        if (response.data) {
+          for (let item in response.data) {
+            this.listData.fUnits.push({
+              label: response.data[item].dictLabel,
+              value: response.data[item].dictValue
+            })
+          }
+        }
+      })
+      //获取存储环境字典表
+      this.getDicts('f_StorageEnvironment').then((response) => {
+        if (response.data) {
+          for (let item in response.data) {
+            this.listData.fStoreenv.push({
+              label: response.data[item].dictLabel,
+              value: response.data[item].dictValue
+            })
+          }
+        }
+      })
       //获取品名
       let queryParams = { pageNum: 1 }
       getGoodName(queryParams).then(res=>{
@@ -951,7 +1054,6 @@ export default {
     //查看
     viewMethod(scope){
       this.detailList.columnList = this.detailStyle
-      this.inDex = this.detailOption.length
       let fId = ''
       if(scope){
          fId = scope.row.fId
@@ -1005,6 +1107,7 @@ export default {
           }
         })
         this.MainTable = true
+        this.inDex = this.detailOption.length
       })
     },
     //修改
@@ -1086,7 +1189,7 @@ export default {
           rows.splice(index, 1)
         }
     },
-    //必填项
+    //必填项新行
     verificationRules(valid){
       if(valid){
         this.detailData.push({
@@ -1098,6 +1201,12 @@ export default {
           fWarehouseid:null,
           fAmount:null,
           fStltypeid:'1',
+          fProductdate:null,
+          fLotno:null,
+          fValid:null,
+          fUnits:null,
+          fStoreenv:null,
+          fIsfilles:0,
           remark:null,
           fReviewDate:null,
           createBy:null,
@@ -1109,8 +1218,6 @@ export default {
         for(let li in this.detailOption) {
           if(this.detailOption[li].name == '供应商'){
             if(this.detailOption[li].disabled == true){
-              this.show = false
-              // row.icon = 'el-icon-arrow-up'
               this.getList();
               this.MainTable = false
             } else {
@@ -1120,10 +1227,8 @@ export default {
                 type: "warning",
               }).then(() => {
                 this.$refs.detailForm.saveRules('1')
-                 // this.MainTable = false
                 }).catch(() => {
-                  this.show = false
-                  // row.icon = 'el-icon-arrow-up'
+                  this.inDex = 4
                   this.MainTable = false
                   this.getList();
                 });
@@ -1156,6 +1261,7 @@ export default {
               this.getList();
               if(i == 1){
                 this.MainTable = false
+                this.inDex = 4
               }
             }
         })
@@ -1282,7 +1388,7 @@ export default {
           this.dialogVisible = true
           break
       }
-      if(row.name == '修改'){
+      if(row.name == '修改' && row.res == '0'){
         this.viewMethod()
       }
       if(row.res === 1){