9/9 初始化业务

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

@@ -16,8 +16,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="制剂规格:">
-              <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="请输入包装规格" clearable="true"
+            <el-form-item label="规格/单位:">
+              <el-input v-model="erpQuery.spec" style="width: 90%" placeholder="包装/制剂 规格/单位" clearable="true"
                         @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
           </el-col>
@@ -86,7 +86,9 @@
         <el-table-column label="物资编码" prop="code"></el-table-column>
         <el-table-column label="物资名称" prop="name"></el-table-column>
         <el-table-column label="计量单位" prop="measname"></el-table-column>
-        <el-table-column label="制剂规格" prop="spec"></el-table-column>
+        <el-table-column label="包装规格" prop="spec"></el-table-column>
+        <el-table-column label="制剂规格" prop="prepnSpec"></el-table-column>
+        <el-table-column label="制剂单位" prop="prepnUnit"></el-table-column>
         <el-table-column label="批准文号" prop="registerNo"></el-table-column>
         <el-table-column label="生产企业" prop="manufactory"></el-table-column>
         <el-table-column label="配送企业" prop="supName"></el-table-column>

src/views/basic/workplace/addBusTypeDialog.vue

@@ -166,6 +166,14 @@
       </el-row>
 
       <el-row :gutter="24" class="el-row">
+        <el-col :span="12" class="el-col">
+          <el-form-item label="单据完成校验:" prop="monopoly" class="query-form-item">
+            <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成校验" >
+              <el-option label="完全赋码" :value="0"></el-option>
+              <el-option label="部分赋码" :value="1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="12" class="el-col" v-if="formData.autoTag == 1">
           <el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item">
             <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存" :disabled="formData.autoTag == 0" >
@@ -265,6 +273,7 @@ export default {
         workplaceType: 3,
         autoTag: 0,
         monopoly: 0,
+        orderFinishVerify: 0,
         invCode: ''
       },
       invList: [],
@@ -463,6 +472,7 @@ export default {
   },
   created() {
     if (this.upData != null) {
+      console.log(this.upData)
       this.formData = this.upData
       if (this.formData.invCode != 0){
         this.formData.invCode = this.upData.invCode + ''
@@ -470,6 +480,9 @@ export default {
       if (this.formData.invCode == 0) {
         this.formData.invCode = ''
       }
+      if (isBlank(this.formData.invCode)) {
+        this.formData.invCode = ''
+      }
       if (this.formData.isMatching == 0) {
         this.getBusType()
       } else {

src/views/basic/workplace/workplaceManage.vue

@@ -210,9 +210,9 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column>
-                <el-table-column label="作业类型" prop="workplaceType" width="90">
+                <el-table-column label="单据完成校验" prop="orderFinishVerify" width="120">
                   <template slot-scope="scope">
-                    <span>{{ workplaceTypeMap[scope.row.workplaceType] }}</span>
+                    <span>{{ orderFinishVerifys[scope.row.orderFinishVerify] }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column label="队列管理" prop="autoTag" width="100">
@@ -802,10 +802,9 @@ export default {
         0: '暂停',
         1: '启用'
       },
-      workplaceTypeMap: {
-        1: '拆零',
-        2: '取整',
-        3: '全部'
+      orderFinishVerifys: {
+        0: '完全赋码',
+        1: '部分赋码',
       },
       warnTypeMap: {
         1: '信息提醒',

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -733,6 +733,7 @@ export default {
           _this.options.findWorkPlace = response.data || [];
           if (_this.options.findWorkPlace.length == 1) {
             _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
           }
         })
         .catch(() => {

src/views/collect/CollectOrderNew.vue

@@ -504,6 +504,7 @@ export default {
           _this.options.findWorkPlace = response.data || []
           if (_this.options.findWorkPlace.length == 1) {
             _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
           }
         })
         .catch(() => {

src/views/collect/PanelOrderDeal.vue

@@ -505,6 +505,7 @@ export default {
           _this.options.findWorkPlace = response.data || [];
           if (_this.options.findWorkPlace .length == 1){
             _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
           }
         })
         .catch(() => {

src/views/collect/PanelOrderEndSearch.vue

@@ -444,6 +444,7 @@ export default {
           _this.options.findWorkPlace = response.data || []
           if (_this.options.findWorkPlace.length == 1) {
             _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
           }
         })
         .catch(() => {

src/views/collect/PanelOrderUpload.vue

@@ -448,6 +448,7 @@ export default {
           _this.options.findWorkPlace = response.data || []
           if (_this.options.findWorkPlace.length == 1) {
             _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
           }
         })
         .catch(() => {