2/26 工位增加业务类型1.0

src/views/basic/workplace/addBusTypeDialog.vue

@@ -117,14 +117,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="12" class="el-col">
+        <!--<el-col :span="12" class="el-col">-->
-          <el-form-item label="业务类型:" prop="productType" class="query-form-item">
+        <!--  <el-form-item label="业务类型:" prop="productType" class="query-form-item">-->
-            <el-select v-model="formData.productType" style="width: 80%" placeholder="出入库方式">
+        <!--    <el-select v-model="formData.productType" style="width: 80%" placeholder="业务类型">-->
-              <el-option label="器械业务" :value="1"></el-option>
+        <!--      <el-option label="器械业务" :value="1"></el-option>-->
-              <el-option label="药品业务" :value="2"></el-option>
+        <!--      <el-option label="药品业务" :value="2"></el-option>-->
-            </el-select>
+        <!--    </el-select>-->
-          </el-form-item>
+        <!--  </el-form-item>-->
-        </el-col>
+        <!--</el-col>-->
       </el-row>
 
       <el-divider></el-divider>

src/views/basic/workplace/busTypeManage.vue

@@ -64,11 +64,6 @@
             <span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="业务类型 " prop="productType" width="100">
-          <template slot-scope="scope">
-            <span>{{ productTypes[scope.row.productType] }}</span>
-          </template>
-        </el-table-column>
         <el-table-column label="出入库方式" prop="inAndOutType" width="120">
           <template slot-scope="scope">
             <span>{{ inAndOutTypes[scope.row.inAndOutType] }}</span>
@@ -320,10 +315,6 @@ export default {
         1: '流通计量单位',
         2: '使用计量单位'
       },
-      productTypes: {
-        1: '器械业务',
-        2: '药品业务'
-      },
       inAndOutTypes: {
         1: '入库',
         2: '出库',

src/views/basic/workplace/cargowWorkplaceManage.vue

@@ -391,6 +391,14 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="12" class="el-col">
+                <el-form-item label="所属业务类型:" prop="productType" class="query-form-item">
+                  <el-select v-model="formData.productType" style="width: 80%" placeholder="所属业务类型">
+                    <el-option label="器械业务" :value="1"></el-option>
+                    <el-option label="药品业务" :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
             <el-row :gutter="24">
 
@@ -720,7 +728,8 @@ export default {
         constituencies: null,
         invRemindNumber: 0,
         queueStatus: 0,
-        remake: null
+        remake: null,
+        productType:1
       },
       fromDeptOptions: [],
       invQuery: {
@@ -733,6 +742,9 @@ export default {
         ],
         workplaceStatus: [
           { required: true, message: '请选择工位状态', trigger: 'blur' }
+        ],
+        productType: [
+          {required: true, message: '请选择所属业务类型', trigger: 'blur'}
         ]
         // workplaceType: [
         //   { required: true, message: '请选择工位类型', trigger: 'blur' }
@@ -992,7 +1004,8 @@ export default {
         constituencies: '1001',
         invRemindNumber: 0,
         queueStatus:0,
-        remake: null
+        remake: null,
+        productType:1
       }
       if (this.groupData != null) {
         this.formData.constituencies = this.groupData.code

src/views/basic/workplace/workplaceManage.vue

@@ -533,14 +533,17 @@
             </el-form-item>
           </el-col>
 
+
           <el-col :span="12" class="el-col">
-            <el-form-item label="备注:" prop="remake" class="query-form-item">
+            <el-form-item label="所属业务类型:" prop="productType" class="query-form-item">
-              <el-input
+              <el-select v-model="formData.productType" style="width: 80%" placeholder="所属业务类型">
-                v-model="formData.remake" style="width: 80%"
+                <el-option label="器械业务" :value="1"></el-option>
-                auto-complete="off"
+                <el-option label="药品业务" :value="2"></el-option>
-              ></el-input>
+              </el-select>
             </el-form-item>
           </el-col>
+
+
           <!--          <el-col :span="12" class="el-col">-->
           <!--            <el-form-item label="库存预警数:" prop="invRemindNumber" class="query-form-item">-->
           <!--              <el-input-number-->
@@ -553,8 +556,16 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
         </el-row>
-
+        <el-row :gutter="24">
-
+        <el-col :span="12" class="el-col">
+          <el-form-item label="备注:" prop="remake" class="query-form-item">
+            <el-input
+              v-model="formData.remake" style="width: 80%"
+              auto-complete="off"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        </el-row>
 
         <!--<el-col :span="12" class="el-col">-->
         <!--  <el-form-item label="单据类型:" prop="orderId" class="query-form-item">-->
@@ -786,7 +797,8 @@ export default {
         constituencies: null,
         invRemindNumber: 0,
         autoCollect:0,
-        remake: null
+        remake: null,
+        productType:1
       },
       workplaceCode: '6001',
       unitStorageList: [],
@@ -823,6 +835,9 @@ export default {
         ],
         workplaceStatus: [
           {required: true, message: '请选择工位状态', trigger: 'blur'}
+        ],
+        productType: [
+          {required: true, message: '请选择所属业务类型', trigger: 'blur'}
         ]
         // workplaceType: [
         //   { required: true, message: '请选择工位类型', trigger: 'blur' }
@@ -1011,7 +1026,8 @@ export default {
         constituencies: "1001",
         invRemindNumber: 0,
         remake: null,
-        autoCollect:0
+        autoCollect:0,
+        productType:1
       }
       if (this.groupData != null) {
         this.formData.constituencies = this.groupData.code

src/views/collect/CollectOrderTabs.vue

@@ -774,7 +774,6 @@ export default {
       let newQuery = { ...this.$route.query }
       delete newQuery.billNo
       newQuery.busType = val
-      this.productType = info.productType
       this.$router.push({ query: newQuery, path: this.$route.path })
       this.formData.busName = info.busName
       this.autoTag = info.autoTag
@@ -936,7 +935,6 @@ export default {
             this.formData.busName = busType.busName
             this.autoTag = busType.autoTag
             this.inAndOutType = busType.inAndOutType
-            this.productType = busType.productType
           } else if (this.busTypeList.length == 1) {
             this.formData.busType = this.busTypeList[0].documentTypeCode
             this.autoTag = this.busTypeList[0].autoTag
@@ -947,7 +945,6 @@ export default {
             })
             this.selectBusTypeDisabled = false
             this.formData.busName = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType).busName
-            this.productType = this.busTypeList[0].productType
           } else {
             this.selectBusTypeDisabled = true
             this.formData.busType = null