Merge branch 'dev-youhua-20210120' into 'release'

input type 1 codereviewer:ping.zhang



See merge request !243

src/views/goods/create-good.vue

@@ -17,7 +17,7 @@
             label-width="150px"
             label-suffix="："
             class="basic-form"
-        > 
+        >
 
           <div class="basic-item-icon">
             <div class="part-tit">通用信息</div>
@@ -815,13 +815,15 @@
         uploadImgMessage1: false,//未上传图片，校验提示语
         isMedic:false, // 商品类型选择【药品】时！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
         isCheckServe: false, // 商品类型选择【检测服务】时！！！！！！！！！！！！！！！！！！！！！！！！！！！！！
+        inputType: ''
       }
     },
     created() {
       vm = this;
-      const { id, storeId, goodsType } = this.$route.query;
+      const { id, storeId, goodsType, inputType } = this.$route.query;
       this.goodsType = goodsType;
       this.storeId = storeId;
+      this.inputType = inputType || '';
       // this.formData = originForm;
       // this.formData1 = originForm1;
       // this.formData2 = originForm2;
@@ -891,7 +893,7 @@
             ...this.rules,
             ...originRules
           };
-            
+
         }else{
           this.isMedic = true;
           const res = await getGoodsList({
@@ -1206,7 +1208,7 @@
         if(!this.isgoodStock){
           return;
         }
-        
+
         let isTrue = false;
         formNameList.map(item=>{
           this.$refs[item].validate((valid) => {
@@ -1220,6 +1222,7 @@
         }else{
           this.formData.costPrice = this.formData.optPrice*100
           this.formData.hasChanged = true;
+          this.formData.inputType =  this.inputType;
           this.updateGoodsInfo();
         }
 

src/views/goods/goods-manage.vue

@@ -419,7 +419,7 @@
         const { goodsType } = row;
         let url = ''
         if(row == 'add'){
-          url = `/create-good?id=add&storeId=${this.searchForm.storeId}`
+          url = `/create-good?id=add&storeId=${this.searchForm.storeId}&inputType=1`
         }else{
           url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}`
         }