问题处理

src/views/basic/collectPoint/gatherOrderType.vue

@@ -146,9 +146,9 @@
           <!--</el-row>-->
           <el-row :gutter="24" class="el-row">
             <el-col :span="12" class="el-col">
-              <el-form-item label="单据来源:" prop="name" class="query-form-item">
+              <el-form-item label="来源系统:" prop="name" class="query-form-item">
                 <el-input
-                  placeholder="请输入单据来源"
+                  placeholder="请输入来源系统"
                   v-model="formData.fromType" style="width: 80%"
                   auto-complete="off"
                 ></el-input>

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

@@ -313,7 +313,7 @@
 
         <el-collapse-item name="3">
           <template slot="title">
-            <p class="form-title">参数设置</p>
+            <p class="form-title">流通使用参数设置</p>
           </template>
           <el-row :gutter="20">
             <el-col :span="11" class="el-col">
@@ -511,7 +511,8 @@ export default {
         useLeverCount: null,
         distributeLevelCount: null,
         useLevelUnit: null,
-
+        distributeLevel: null,
+        useLevel: null,
       },
       thirdSys: [],
       classifyList: [],
@@ -784,6 +785,7 @@ export default {
       const matchingItem = this.detailList.find(item => item.nameCode == val);
       if (matchingItem) {
         this.newProductData.distributeLevelUnit = matchingItem.packUnit;
+        this.newProductData.distributeLevel = matchingItem.packLevel
       }
       calculateDistCount(matchingItem).then((res) => {
         this.newProductData = {
@@ -798,6 +800,7 @@ export default {
       const matchingItem = this.detailList.find(item => item.nameCode == val);
       if (matchingItem) {
         this.newProductData.useLevelUnit = matchingItem.packUnit;
+        this.newProductData.useLevel = matchingItem.packLevel;
       }
       calculateUseCount(matchingItem).then((res) => {
         this.newProductData = {

src/views/collect/DealOrder.vue

@@ -105,26 +105,27 @@
           </el-col>
 
           <el-col :span="6">
-            <el-form-item prop="busType"  class="query-form-item" label="单据类型:">
+            <el-form-item prop="busType" class="query-form-item" label="业务类型:">
               <el-select v-model="formData.busType"
                          filterable
                          remote
+                         @change="busTypeChange"
                          reserve-keyword
-                         placeholder="请选择单据类型" clearable style="width: 90%">
+                         placeholder="请选择业务类型" clearable style="width: 90%">
                 <el-option
                   v-for="item in busTypeList"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
+                  :key="item.documentTypeCode"
+                  :label="item.busName"
+                  :value="item.documentTypeCode"
                 >
-                  <span style="float: left">{{ item.name }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                  <span style="float: left">{{ item.busName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{ item.documentTypeCode }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
 
-          <el-col :span="6" v-if="this.formDataVisible != null &&  this.formDataVisible.operationType == 1">
+          <el-col :span="6" v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1">
             <el-form-item class="query-form-item" :label="this.formDataVisible.unitTittle + ':'">
               <el-select v-model="formData.fromCorp"
                          filterable
@@ -258,8 +259,6 @@
       </el-dialog>
 
 
-
-
       <el-dialog
         title="选择作业单据类型"
         :visible.sync="selectBusTypeDisabled"
@@ -279,8 +278,11 @@
 
             >
 
-              <div style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */" @click="selectBusType(info.code)" >
-                <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p> <!-- 假设你的信息对象中包含一个title属性 -->
+              <div
+                style="display: flex; justify-content: space-between; align-items: center; height: 66px; /* 约为 200px 的 1/3 */"
+                @click="selectBusType(info.code)">
+                <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.name }}</p>
+                <!-- 假设你的信息对象中包含一个title属性 -->
                 <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
                 <!--              &lt;!&ndash; 二维码占位，这里用灰色方块代替 &ndash;&gt;-->
                 <!--&lt;!&ndash;              <span>QR</span>&ndash;&gt;-->
@@ -288,22 +290,23 @@
 
                 <!--            </div>-->
               </div>
-              <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;" @click="selectBusType(info.code)">
+              <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"
+                   @click="selectBusType(info.code)">
                 <!-- 假设这里有一些信息内容 -->
                 <p style="font-size: 14px;background-color: #e1f3fb">{{ info.code }}</p>
-                <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="selectBusType(info.code)">开始作业</el-button>
+                <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
+                           @click="selectBusType(info.code)">开始作业
+                </el-button>
 
               </div>
 
 
-
             </el-card>
           </el-col>
         </el-row>
       </el-dialog>
 
 
-
     </el-form>
   </div>
 </template>
@@ -355,7 +358,7 @@ export default {
       total: 0,
       defaultSort: {prop: 'createTime', order: 'desc'},
       formDataVisible: {
-        operationType: null,
+        scanType: null,
         unitTittle: "往来单位",
         corpType: 1,
       },
@@ -414,7 +417,6 @@ export default {
   },
   methods: {
     selectBusType(val) {
-
       this.formData.busType = val
       this.selectBusTypeDisabled = false
       if (this.formData.workPlaceCode != null) {
@@ -428,8 +430,14 @@ export default {
           this.busTypeList = res.data.list
           this.busTypeTotal = res.data.total
           if (this.busTypeList.length == 1) {
-            this.formData.busType = this.busTypeList[0].code
+
+            let busType = this.busTypeList[0]
+            this.formData.busType = this.busTypeList[0].documentTypeCode
             this.selectBusTypeDisabled = false
+            this.formDataVisible = busType
+            if (this.formDataVisible.scanType == 1) {
+              this.findFromInvList("");
+            }
             this.findCurOrder();
           } else {
             this.formData.busType = null
@@ -450,17 +458,21 @@ export default {
         });
     },
     workPlaceCodeChange(value) {
-      this.curWorkPlaces.forEach(item => {
-        if (item.workplaceId == value) {
-          this.formDataVisible = item
-        }
-      })
       this.getWorkBindBusTypes(value)
-      if (this.formDataVisible.operationType == 1) {
+      return
+    },
+
+    busTypeChange(value) {
+      let busType = this.busTypeList.find(item => item.documentTypeCode === value);
+      this.formData.busType = busType.documentTypeCode
+      this.selectBusTypeDisabled = false
+      this.formDataVisible = busType
+      if (this.formDataVisible.scanType == 1) {
         this.findFromInvList("");
       }
-      return
+      this.findCurOrder();
     },
+
     handleClick(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
@@ -606,7 +618,8 @@ export default {
         fromCorp: this.formData.fromCorp,
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
-        insert: this.formData.insert
+        insert: this.formData.insert,
+        busType: this.formData.busType,
       };
       tagCode(tagQuery).then(res => {
         this.loading = false