耗材字典相关修改，新增集采，配送

src/views/basic/busType/busTypeAdvancedSettings.vue

@@ -70,6 +70,22 @@
         </el-col>
       </el-row>
 
+      <el-row :gutter="20" type="flex">
+        <el-col :span="24" >
+          <div class="check-box-group" style="margin-top: 12px">
+            <el-checkbox v-model="inputQuery.vailDispatch"  border  style="width: 200px;">校验产品是否可配送
+            </el-checkbox>
+            <span style="margin-left: 45px">校验是否集采产品:</span>
+            <el-select v-model="inputQuery.vailGroupBuy" style="margin-left: 5px"
+                       size="mini">
+              <el-option label="无需校验" :value=0></el-option>
+              <el-option label="只采集集采产品" :value=1></el-option>
+              <el-option label="只采集非集采产品" :value=2></el-option>
+            </el-select>
+          </div>
+        </el-col>
+      </el-row>
+
       <el-divider></el-divider>
       <el-row type="flex">
         <el-col :span="24">

src/views/basic/busType/bussinessType.vue

@@ -219,6 +219,8 @@ export default {
         checkBalance: null,
         secCheckBalance: null,
         preInBack:null,
+        vailDispatch:null,
+        vailGroupBuy:null,
       },
       enableMap: {
         true: "是",
@@ -411,6 +413,8 @@ export default {
         preIn: null,
         originAction: null,
         preInBack:null,
+        vailDispatch:null,
+        vailGroupBuy:null,
       }
       this.addDialogVisible = true;
     },

src/views/basic/product/SelectDIDetailDialog.vue

@@ -405,7 +405,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>包装单位/包装级别:&nbsp;</span>
+                    <span>包装层级:&nbsp;</span>
                   </div>
 
                   <el-input

src/views/basic/product/basicCompanyProductsImport.vue

@@ -189,8 +189,8 @@
 
               <el-row>
                 <el-col :span="12" class="el-col">
-                  <el-form-item label="包装单位/包装级别" prop="bzcj">
+                  <el-form-item label="包装层级" prop="bzcj">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+                    <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
                   </el-form-item>
                 </el-col>
 

src/views/basic/product/product.vue

@@ -46,8 +46,6 @@
                             style="width: 90%"></el-input>
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="对照条件:">
                   <el-select v-model="filterQuery.filterType" placeholder="请选择过滤对照条件"
@@ -62,6 +60,9 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
+
               <el-col :span="6">
                 <el-form-item class="query-form-item" label="注册备案人:">
                   <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产企业/注册备案人"
@@ -76,6 +77,24 @@
                             clearable="true"></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="集采状态">
+                  <el-select v-model="filterQuery.groupBuy" placeholder="集采状态" clearable>
+                    <el-option label="全部" value=""></el-option>
+                    <el-option label="集采" value="true"></el-option>
+                    <el-option label="非集采" value="false"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item class="query-form-item" label="可配送状态">
+                  <el-select v-model="filterQuery.dispatch" placeholder="可配送状态" clearable>
+                    <el-option label="全部" value=""></el-option>
+                    <el-option label="可配送" value="true"></el-option>
+                    <el-option label="不可配送" value="false"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
           <div class="top-right-btn">
@@ -191,11 +210,12 @@
                 <span>产品标识:</span>
               </div>
 
-              <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
+              <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3"
+                        highlight-current-row @current-change="handleDetail">
                 <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
                 <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
                 <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-                <el-table-column label="包装层级" prop="packUnit" show-overflow-tooltip></el-table-column>
+                <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
               </el-table>
             </el-card>
             <el-card>
@@ -895,7 +915,7 @@
                       <el-col :span="12" class="el-col">
                         <div class="text item">
                           <div class="itemTag">
-                            <span>包装单位/包装级别:&nbsp;</span>
+                            <span>包装层级:&nbsp;</span>
                           </div>
 
                           <el-input
@@ -1152,6 +1172,7 @@ import selectHospProduct from "@/views/basic/product/bindHospProduct";
 import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
 import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
 
+
 export default {
   data() {
     return {
@@ -1168,7 +1189,10 @@ export default {
         addType: 1,
         thrPiId: null,
         filterType: null,
-        diType: 1
+        diType: 1,
+        dispatch: null,
+        groupBuy: null,
+
       },
       rId: null,
       selectUdiTypeVisible: false,
@@ -1523,7 +1547,7 @@ export default {
       this.getList();
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
+      this.filterQuery.page = val;
       this.getList();
     },
     handleModifyClick(row) {

src/views/basic/product/productEdit.vue

@@ -18,8 +18,11 @@
           <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
-                <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">关联</el-button>
+              <el-button type="text" @click="addSelectErp(scope.row)" :disabled="scope.row.thirdId==editQuery.nameCode">
-                <el-button type="text" @click.native.stop="removeErp(scope.row)" :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
+                关联
+              </el-button>
+              <el-button type="text" @click.native.stop="removeErp(scope.row)"
+                         :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''">解绑
               </el-button>
             </template>
           </el-table-column>
@@ -35,13 +38,16 @@
         <div style=" float: right;
                         text-align: right;
                         margin-bottom: 8px;">
-            <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1" style="text-align:right">解绑DI器械信息</el-button>
+          <el-button type="primary" size="mini" icon="search" @click="removeDi" v-if="productType!=1"
+                     style="text-align:right">解绑DI器械信息
+          </el-button>
         </div>
-          <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row @current-change="handleDetail">
+        <el-table v-loading="loading" :data="detailList" style="width: 100%; " border key="3" highlight-current-row
+                  @current-change="handleDetail">
           <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>
           <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
           <el-table-column label="包装级别" prop="packLevel" show-overflow-tooltip></el-table-column>
-            <el-table-column label="包装层级" prop="packUnit" show-overflow-tooltip></el-table-column>
+          <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
           <el-table-column label="操作" width="180px">
             <template slot-scope="scope">
               <el-button type="text" @click.native.stop="singleDiEdit">编辑</el-button>
@@ -184,27 +190,42 @@
       </el-row>
       <el-row type="flex" class="edit-row">
         <el-col :span="12">
-          <el-form-item label="最小包装可使用次数:">
+          <el-form-item label="医保编码:">
             <el-input
               style="width: 80%"
               size="small"
               splaceholder="请输入内容"
-              :disabled="this.useNumEnable"
+              v-model="editQuery.ybbm"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="使用周期(天):">
+            <el-input
+              style="width: 80%"
+              size="small"
               type="number"
-              v-model="editQuery.useNum"
+              splaceholder="请输入内容"
+              v-model="editQuery.useExpireTime"
             ></el-input>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row>
         <el-col :span="12">
-          <el-form-item label="医保编码:">
+          <el-form-item label="最小包装可使用次数:">
             <el-input
               style="width: 80%"
               size="small"
               splaceholder="请输入内容"
-              v-model="editQuery.ybbm"
+              :disabled="this.useNumEnable"
+              type="number"
+              v-model="editQuery.useNum"
             ></el-input>
           </el-form-item>
         </el-col>
+
       </el-row>
       <el-row type="flex">
         <el-col :span="24">
@@ -254,7 +275,29 @@
                          @change="useMutiChange"
                          style="width: 180px"
                          border
-            >允许科室多次使用出库
+            >多次/重复使用耗材
+            </el-checkbox>
+
+
+            <el-checkbox v-model="editQuery.dispatch"
+                         style="width: 180px"
+                         border
+            >是否可配送
+            </el-checkbox>
+
+
+          </div>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="20" class="el-row" type="flex">
+        <el-col :span="24" class="el-col">
+          <div style="margin-bottom: 18px;margin-left: 25px">
+            <el-checkbox v-model="editQuery.groupBuy"
+                         style="width: 180px"
+                         @change="groupBuyChange"
+                         border
+            >是否集采产品
             </el-checkbox>
           </div>
         </el-col>
@@ -550,7 +593,13 @@ export default {
       this.selectErpDialogVisible = false;
       this.getThirdSysDetail();
     },
-
+    groupBuyChange() {
+      if (this.editQuery.groupBuy == true) {
+        this.editQuery.dispatch = true;
+      } else {
+        this.editQuery.dispatch = false;
+      }
+    },
   }
 }
 </script>

src/views/basic/product/udIInfoSelect.vue

@@ -197,8 +197,8 @@
 
                 <el-row>
                     <el-col :span="12" class="el-col">
-                          <el-form-item label="包装单位/包装级别" prop="bzcj">
+                          <el-form-item label="包装层级" prop="bzcj">
-                            <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+                            <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
                           </el-form-item>
                     </el-col>
 

src/views/basic/product/udilnfoManageSpDetail.vue

@@ -425,7 +425,7 @@
             <el-col :span="12" class="el-col">
               <div class="text item">
                 <div class="itemTag">
-                  <span>包装单位/包装级别:&nbsp;</span>
+                  <span>包装层级:&nbsp;</span>
                 </div>
 
                 <el-input

src/views/biz/UdiTrace.vue

@@ -438,7 +438,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>包装单位/包装级别:&nbsp;</span>
+                    <span>包装层级:&nbsp;</span>
                   </div>
 
                   <el-input

src/views/inout/DialogSelectRl.vue

@@ -354,7 +354,7 @@
           <el-col :span="12" class="el-col">
             <div class="text item">
               <div class="itemTag">
-                <span>包装单位/包装级别:&nbsp;</span>
+                <span>包装层级:&nbsp;</span>
               </div>
 
               <el-input

src/views/purchase/company/basicSelectSingleProducts.vue

@@ -188,8 +188,8 @@
 
             <el-row>
               <el-col :span="12" class="el-col">
-                <el-form-item label="包装单位/包装级别" prop="bzcj">
+                <el-form-item label="包装层级" prop="bzcj">
-                  <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+                  <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
                 </el-form-item>
               </el-col>
 

src/views/purchase/company/companyProducts.vue

@@ -188,8 +188,8 @@
 
               <el-row>
                 <el-col :span="12" class="el-col">
-                  <el-form-item label="包装单位/包装级别" prop="bzcj">
+                  <el-form-item label="包装层级" prop="bzcj">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+                    <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
                   </el-form-item>
                 </el-col>
 

src/views/purchase/purApply/purApplyProducts.vue

@@ -188,8 +188,8 @@
 
               <el-row>
                 <el-col :span="12" class="el-col">
-                  <el-form-item label="包装单位/包装级别" prop="bzcj">
+                  <el-form-item label="包装层级" prop="bzcj">
-                    <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+                    <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
                   </el-form-item>
                 </el-col>
 

src/views/purchase/purApply/purUdiRlDetailDialog.vue

@@ -111,8 +111,8 @@
 
         <el-row>
           <el-col :span="12" class="el-col">
-            <el-form-item label="包装单位/包装级别" prop="bzcj">
+            <el-form-item label="包装层级" prop="bzcj">
-              <el-input style="width: 90%" size="small" splaceholder="请输入包装单位/包装级别" v-model="editQuery.bzcj" :disabled="true"></el-input>
+              <el-input style="width: 90%" size="small" splaceholder="请输入包装层级" v-model="editQuery.bzcj" :disabled="true"></el-input>
             </el-form-item>
           </el-col>