8/26 优化耗材字典 加入工位预警数量 放开是否拆零

src/views/basic/product/drug/drugAdd.vue

@@ -179,7 +179,7 @@
           <el-row type="flex">
             <el-col :span="11" class="el-col">
               <el-form-item label="药品类型:" prop="physicType">
-                <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型" clearable>
+                <el-select v-model="newProductData.physicType" style="width: 90%" placeholder="选择药品类型" >
                   <el-option label="特殊药品原料药" :value="1"></el-option>
                   <el-option label="特殊药品制剂" :value="2"></el-option>
                   <el-option label="普通药品" :value="3"></el-option>
@@ -551,6 +551,9 @@ export default {
         ],
         price: [
           {required: true, message: '药品价格不能为空', trigger: 'blur'}
+        ],
+        majorStatus: [
+          {required: true, message: '请选择药品状态', trigger: 'blur'}
         ]
       },
       detailList: [

src/views/basic/product/product.vue

@@ -1688,7 +1688,6 @@
               >提交
               </el-button>
               <el-button
-                type="primary"
                 size="small"
                 icon="search"
                 @click="cancelDialog"

src/views/basic/product/productEdit.vue

@@ -379,6 +379,20 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="工位预警数量:">
+              <el-input
+                type="number"
+                style="width: 80%"
+                min="1"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.workPlaceCount"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
 
       </el-card>
@@ -711,23 +725,23 @@
                 <span class="sptext">是否必须维护资质材料</span>
               </el-col>
             </el-row>
-            <!--<el-divider></el-divider>-->
+            <el-divider></el-divider>
-            <!--<el-row>-->
+            <el-row>
-            <!--  <el-col span="5">-->
+              <el-col span="5">
-            <!--    <span class="sptext">是否拆零</span>-->
+                <span class="sptext">是否拆零</span>
-            <!--  </el-col>-->
+              </el-col>
-            <!--  <el-divider direction="vertical"></el-divider>-->
+              <el-divider direction="vertical"></el-divider>
-            <!--  <el-col span="5">-->
+              <el-col span="5">
-            <!--    <el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>-->
+                <el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>
-            <!--      <el-option label="是" :value="true"></el-option>-->
+                  <el-option label="是" :value="true"></el-option>
-            <!--      <el-option label="否" :value="false"></el-option>-->
+                  <el-option label="否" :value="false"></el-option>
-            <!--    </el-select>-->
+                </el-select>
-            <!--  </el-col>-->
+              </el-col>
-            <!--  <el-divider direction="vertical"></el-divider>-->
+              <el-divider direction="vertical"></el-divider>
-            <!--  <el-col span="13">-->
+              <el-col span="13">
-            <!--    <span class="sptext">是否拆零</span>-->
+                <span class="sptext">是否拆零</span>
-            <!--  </el-col>-->
+              </el-col>
-            <!--</el-row>-->
+            </el-row>
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">

src/views/inout/DialogNewReviewOrder.vue

@@ -218,7 +218,7 @@ export default {
         if (response.code === 20000) {
           this.$refs.inputRef.focus();
           this.$refs.inputRef.select();
-          this.udiCode = response.data;
+          this.udiCode = response.data.code;
           this.originCode = '';
           this.addCode();
         } else {