Merge branch 'dev-m2-20200907' into 'release'

Dev m2 20200907 codereviewer:pingzhang



See merge request !217

src/views/goods/create-good.vue

@@ -97,6 +97,17 @@
 
           <div class="basic-item-icon" v-if="isMedic">
             <div class="part-tit">药品信息</div>
+            <el-form-item label="条形码" prop="barCode">
+              <el-col :span="18">
+                <el-input
+                    size="small"
+                    v-model="formData.barCode"
+                    placeholder="请输入条形码"
+                ></el-input>
+                <span class="fast-opt" @click="fastInput">快速录入</span>
+                <span class="word-num">(点击可快速录入下面的药品信息)</span>
+              </el-col>
+            </el-form-item>
             <el-form-item label="批准文号" prop="approvalNumber">
               <el-col :span="18">
                 <el-input
@@ -105,8 +116,6 @@
                     placeholder="请输入批准文号"
                     style="width:50%;"
                 ></el-input>
-                <span class="fast-opt" @click="fastInput">快速录入</span>
-                <span class="word-num">(点击可快速录入下面的药品信息)</span>
               </el-col>
             </el-form-item>
 
@@ -392,17 +401,6 @@
                  <!-- <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/60</span> -->
                 </el-col>
               </el-form-item>
-              <el-form-item label="条形码" prop="barCode">
-                <el-col :span="20">
-                  <el-input
-                      size="small"
-                      v-model="formData.barCode"
-                      placeholder="请输入条形码"
-
-                  ></el-input>
-                 <!-- <span class="word-num">{{(formData.name).replace(/\s+/g,"").length}}/60</span> -->
-                </el-col>
-              </el-form-item>
             </div>
           </div>
         </el-form>
@@ -453,6 +451,13 @@
           callback();
         }
       };
+
+      const checkBarcode = (rule, value, cb) => {
+        const valedBarcode = new RegExp("[\\u4E00-\\u9FFF]+","g"); 
+        if(value && valedBarcode.test(value)) cb(new Error('条形码不能输入中文'));
+        cb();
+      }
+
       return{
         stock:{
           title:'减少库存',
@@ -501,6 +506,7 @@
           value: '3',
         }],
         formData: {
+          medicationId: 0,
           optPrice:0,
           id:'',
           categoryId:'',
@@ -614,9 +620,10 @@
           specification_url:[
             { required: true, message: "请上传药品说明书", trigger: "blur" }
           ],
-          // barCode: [
-          //   { required: true, message: "请输入条形码", trigger: "blur" },
-          // ],
+          barCode: [
+            { required: false, message: "请输入条形码", trigger: "blur" },
+            { validator: checkBarcode, trigger: "blur" }
+          ],
           optPrice: [
             { required: true, message: "请输入零售价", trigger: "blur" },
           ],
@@ -729,11 +736,12 @@
       //快速录入
       fastInput(){
         ///medications/query/{approvalnumber}
-        if(this.formData.approvalNumber == ''){
-          this.$refs.formData.validateField("approvalNumber")
+        if(this.formData.barCode == ''){
+          this.$refs.formData.validateField("barCode")
           return;
         }
-        this.GET("store/medications/query/"+this.formData.approvalNumber).then(res => {
+        // this.GET("store/medications/query/"+this.formData.approvalNumber).then(res => {
+        this.GET(`store/medications/query/barcode/${this.formData.barCode}`).then(res => {
             console.log(res)
             if(res.code != '000000'){
               return this.$message({
@@ -748,6 +756,8 @@
               });
             }
             const {imageList,medicationInfo} = res.data
+            this.formData.medicationId = medicationInfo.id;
+            this.formData.approvalNumber = medicationInfo.approvalNumber;
             const {medicCommonName,
               medicGoodsName,
               dosageId,