Merge branch 'dev-0225' into 'release'

Dev 0225



See merge request !246

src/views/goods/create-good.vue

@@ -104,8 +104,8 @@
             label-suffix="："
             class="basic-form"
         >
-          <div class="basic-item-icon" v-show="isMedic && !isCheckServe">
-            <div class="part-tit">药品信息</div>
+          <div class="basic-item-icon" v-show="!isCheckServe">
+            <div class="part-tit">基本信息</div>
             <el-form-item label="条形码" prop="barCode">
               <el-col :span="18">
                 <el-input
@@ -116,7 +116,7 @@
                     @input="changeBarCode"
                 ></el-input>
                 <span class="fast-opt" @click="fastInput(1)">快速录入</span>
-                <span class="word-num">(点击可快速录入下面的药品信息)</span>
+                <span class="word-num">(点击可快速录入下面的基本信息)</span>
               </el-col>
             </el-form-item>
             <el-form-item label="批准文号" prop="approvalNumber">
@@ -130,13 +130,13 @@
               </el-col>
             </el-form-item>
 
-            <el-form-item label="药品通用名称" prop="medicCommonName">
+            <el-form-item label="通用名称" prop="medicCommonName">
               <el-col :span="13">
                 <el-input
                     :disabled="goodDisabled || barAndGoodsFlag"
                     size="small"
                     v-model="formData1.medicCommonName"
-                    placeholder="请输入药品通用名称"
+                    placeholder="请输入通用名称"
                     style="width:70%;"
                     maxlength="60"
                     show-word-limit
@@ -145,12 +145,12 @@
                <!-- <span class="word-num">{{(formData.medicCommonName).replace(/\s+/g,"").length}}/60</span> -->
               </el-col>
             </el-form-item>
-            <el-form-item label="药品商品名称" prop="medicGoodsName">
+            <el-form-item label="商品名称" prop="medicGoodsName">
               <el-col :span="13">
                 <el-input
                     size="small"
                     v-model="formData1.medicGoodsName"
-                    placeholder="请输入药品商品名称"
+                    placeholder="请输入商品名称"
 
                     maxlength="60"
                     show-word-limit
@@ -159,12 +159,12 @@
                 <!-- <span class="word-num">{{(formData.medicGoodsName).replace(/\s+/g,"").length}}/60</span> -->
               </el-col>
             </el-form-item>
-            <el-form-item label="药品规格" prop="size">
+            <el-form-item label="规格" prop="size">
               <el-col :span="13">
                 <el-input
                     size="small"
                     v-model="formData1.size"
-                    placeholder="请输入药品规格"
+                    placeholder="请输入规格"
                     style="width:70%;"
                 ></el-input>
 
@@ -335,7 +335,31 @@
                 <span class="word-num"></span>
               </el-col>
             </el-form-item>
-            <el-form-item label="药品说明书">
+
+            <el-form-item label="型号" prop="modelNo">
+              <el-col :span="13">
+                <el-input
+                    size="small"
+                    v-model="formData1.modelNo"
+                    placeholder="请输入型号"
+                    style="width:70%;"
+                ></el-input>
+                <span class="word-num"></span>
+              </el-col>
+            </el-form-item>
+            <el-form-item label="执行标准号" prop="standardNo">
+              <el-col :span="13">
+                <el-input
+                    size="small"
+                    v-model="formData1.standardNo"
+                    placeholder="请输入执行标准号"
+                    style="width:70%;"
+                ></el-input>
+                <span class="word-num"></span>
+              </el-col>
+            </el-form-item>
+
+            <el-form-item label="说明书">
               <el-upload
 
                   class="bg-uploader"
@@ -364,7 +388,7 @@
                   <p>支持jpeg, png格式</p>
                 </div>
               </el-upload>
-              <p class="upload-message" v-if="!isSpecification_url">请上传药品说明书</p>
+              <p class="upload-message" v-if="!isSpecification_url">请上传说明书</p>
             </el-form-item>
           </div>
         </el-form>
@@ -399,8 +423,6 @@
                     v-model="formData2.barCode"
                     placeholder="请输入条形码"
                 ></el-input>
-                <!-- <span class="fast-opt" @click="fastInput(2)">快速录入</span>
-                <span class="word-num">(点击可快速录入下面的药品信息)</span> -->
               </el-col>
             </el-form-item>
             <el-form-item label="检测登记表" prop="checkPackageId">
@@ -782,7 +804,7 @@
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
         formData: JSON.parse(JSON.stringify(originForm)), // 通用信息
-        formData1: JSON.parse(JSON.stringify(originForm1)), // 药品信息
+        formData1: JSON.parse(JSON.stringify(originForm1)), // 基本信息
         formData2: JSON.parse(JSON.stringify(originForm2)),
         rules: {},
         rules1: {},
@@ -895,7 +917,7 @@
           };
 
         }else{
-          this.isMedic = true;
+          this.isMedic = goodsType == '5';
           const res = await getGoodsList({
             goodsIdList:[id],
             goodsName	:'',
@@ -922,18 +944,20 @@
           this.fileGoodsList = this.getImges(goodsList[0].goodsImgList,1);
           this.fileIntrList = this.getImges(goodsList[0].medicImgList,2);
           this.formData.stock = this.formData.goodsStock;
-          this.formData.otc1 = this.formData.otc ? '1' : '0'
+          this.formData.otc1 = this.formData.otc ? '1' : '0';
           if(this.isMedic){
             this.getLever(5,2,1)
+          }else{
+            this.getLever(goodsType,1);
           }
           const {categoryIdLevel2,categoryIdLevel3,categoryIdLevel4,categoryIdLevel5} = this.formData
-          if(categoryIdLevel2 != -1){
+          if(categoryIdLevel2 && categoryIdLevel2 != -1){
             this.getLever(categoryIdLevel2,3,1)
           }
-          if(categoryIdLevel3 != -1){
+          if(categoryIdLevel3 && categoryIdLevel3 != -1){
             this.getLever(categoryIdLevel3,4,1)
           }
-          if(categoryIdLevel4 != -1){
+          if(categoryIdLevel4 && categoryIdLevel4 != -1){
             this.getLever(categoryIdLevel4,5,1)
           }
           //this.totalRows = res.data.totalCount
@@ -1045,11 +1069,26 @@
       },
       getGoodsTypes(goodsType,type){
         this.goodsType = goodsType;
-        if(goodsType == 5){
-          this.isMedic = true;
-          this.isCheckServe = false;
-          this.getLever(goodsType,type);
-        } else if(goodsType == 337){
+        // if(goodsType == 5){
+        //   this.isMedic = true;
+        //   this.isCheckServe = false;
+        //   this.getLever(goodsType,type);
+        // } else if(goodsType == 337){
+        //   this.isMedic = false;
+        //   this.isCheckServe = true;
+        //   getHospitalInfoByStoreId(this.storeId).then(({code,message,data})=>{
+        //     this.formData2.hospitalName = data.hospital;
+        //   })
+        //   getCheckPackageIdList().then(res=>{
+        //     console.log(`getCheckPackageIdList`, res);
+        //     this.checkPackageIdList = res.data;
+        //   })
+        // }else{
+        //   this.isMedic = false;
+        //   this.isCheckServe = false;
+        // };
+
+        if(goodsType == 337){
           this.isMedic = false;
           this.isCheckServe = true;
           getHospitalInfoByStoreId(this.storeId).then(({code,message,data})=>{
@@ -1060,9 +1099,10 @@
             this.checkPackageIdList = res.data;
           })
         }else{
-          this.isMedic = false;
+          this.isMedic = goodsType == '5';
           this.isCheckServe = false;
-        };
+          this.getLever(goodsType,type);
+        }
         console.log(this.formData);
       },
       defaultArr(){

src/views/goods/forms.js

@@ -16,6 +16,8 @@ const form1 = {
   specification_url:'',
   treatDisease:'',
   barCode: '',
+  modelNo: '', // 型号
+  standardNo: '', // 执行标准号
 }
 
 const form2 = {

src/views/goods/goods-manage.vue

@@ -40,7 +40,7 @@
 
           <el-col :span="12" style="text-align: right">
             <el-button type="primary" size="small" @click="exportOpt">批量导出商品</el-button>
-            <el-button type="primary" size="small" @click="batchOpt(3)">批量导入商品</el-button>
+            <el-button v-if="isSSO" type="primary" size="small" @click="batchOpt(3)">批量导入商品</el-button>
             <el-button type="primary" size="small" @click="edit('add')">新建单个商品</el-button>
           </el-col>
         </el-row>
@@ -57,7 +57,7 @@
         <el-table-column prop="goodsName" label="商品名称" width="140" align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="type" label="商品类型" width="100" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.goodsType | rangeType }}</span>
+            <span>{{ scope.row.goodsTypeStr }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" label="商品状态" width="100" align="center">
@@ -232,7 +232,8 @@
         typeList: [],
         //uploadUrl:getBaseUrl('store/goods/import'),
         postData:{},
-        validateFailedList:[]
+        validateFailedList:[],
+        isSSO: 0, // 是否是sso后台管理员 1是 0否
       }
     },
     created() {
@@ -322,7 +323,7 @@
 
               if(res.code != '000000'){
                 return self.$message({
-                  message: '上传失败，请重新上传!',
+                  message: res.message || '上传失败，请重新上传!',
                   type: 'error'
                 });
               }
@@ -342,12 +343,15 @@
               }
 
 
+            }).catch(err => {
+              console.log(`上传报错`, err);
             })
         };
         reader.readAsDataURL(file);
       },
       uploadTemp(){
-        let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx"
+        // let url = "https://file.yunqueyi.com/trade/store/goods_import_template.xlsx"
+        const url = 'https://file.yunqueyi.com/trade/store/20210129/goods_import_template.xlsx';
         window.location.href = url
       },
       getLever(id=0){
@@ -375,6 +379,7 @@
           }
           this.tableData = res.data.goodsList
           this.totalRows = res.data.totalCount
+          this.isSSO = res.data.isSSO;
         })
       },
       //获取商品id

src/views/goods/rules.js

@@ -30,18 +30,18 @@ const rules1 = {
   medicCommonName:[
     { required: true, message: "请输入商品通用名称", trigger: "blur" }
   ],
-  size:[
-    { required: true, message: "请输入商品规格", trigger: "blur" }
-  ],
-  manufacturer:[
-    { required: true, message: "请输入生产厂家", trigger: "blur" }
-  ],
+  // size:[
+  //   { required: true, message: "请输入商品规格", trigger: "blur" }
+  // ],
+  // manufacturer:[
+  //   { required: true, message: "请输入生产厂家", trigger: "blur" }
+  // ],
   approvalNumber:[
     { required: true, message: "请输入批准文号", trigger: "blur" }
   ],
-  dosageId:[
-    { required: true, message: "请选择剂型", trigger: "change" }
-  ],
+  // dosageId:[
+  //   { required: true, message: "请选择剂型", trigger: "change" }
+  // ],
   categoryIdLevel2:[
     { required: true, message: "请选择药品类型", trigger: "blur" }
   ],