问题处理

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

@@ -14,12 +14,12 @@
             </el-button>
           </div>
           <el-table
-            v-loading="loading"
-            :data="detailList"
-            style="width: 100%;"
-            border
-            key="3"
-            @current-change="handleDetail"
+              v-loading="loading"
+              :data="detailList"
+              style="width: 100%;"
+              border
+              key="3"
+              @current-change="handleDetail"
           >
             <el-table-column label="序号" type="index"></el-table-column>
             <el-table-column label="层级标识" prop="nameCode" show-overflow-tooltip width="160">
@@ -73,19 +73,19 @@
                            @click.native="levelSave(scope.row)">保存
                 </el-button>
                 <el-button
-                  type="text"
-                  size="small"
-                  v-if="scope.$index != selectedIndex  "
-                  @click.stop="true"
-                  @click.native="rowChange(scope.$index,scope.row)"
+                    type="text"
+                    size="small"
+                    v-if="scope.$index != selectedIndex  "
+                    @click.stop="true"
+                    @click.native="rowChange(scope.$index,scope.row)"
                 >编辑
                 </el-button>
                 <el-button
-                  type="text"
-                  size="small"
-                  @click.stop="true"
-                  :disabled="scope.$index == selectedIndex  ||  scope.row.id == null"
-                  @click.native="deleteLevel(scope.$index, scope.row)"
+                    type="text"
+                    size="small"
+                    @click.stop="true"
+                    :disabled="scope.$index == selectedIndex  ||  scope.row.id == null"
+                    @click.native="deleteLevel(scope.$index, scope.row)"
                 >删除
                 </el-button>
               </template>
@@ -221,25 +221,25 @@
             <el-col :span="11" class="el-col">
               <el-form-item label="药品价格:" prop="price">
                 <el-input
-                  style="width: 90%"
-                  size="small"
-                  placeholder="请输入药品价格"
-                  type="number"
-                  :precision="2"
-                  :min="0"
-                  v-model.number="newProductData.price"
+                    style="width: 90%"
+                    size="small"
+                    placeholder="请输入药品价格"
+                    type="number"
+                    :precision="2"
+                    :min="0"
+                    v-model.number="newProductData.price"
                 ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="11" class="el-col">
               <el-form-item label="有效期:" prop="indate">
                 <el-date-picker
-                  style="width: 90%"
-                  v-model="newProductData.indate"
-                  type="datetime"
-                  format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择有效期"
+                    style="width: 90%"
+                    v-model="newProductData.indate"
+                    type="datetime"
+                    format="yyyy 年 MM 月 dd 日 HH 点 mm 分 ss 秒"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择有效期"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -282,12 +282,12 @@
             <el-col :span="11">
               <el-form-item label="收费项目编码:">
                 <el-input
-                  style="width: 65%"
-                  size="small"
-                  placeholder="选择项目收费编码"
-                  v-model="newProductData.payFeeCode"
+                    style="width: 65%"
+                    size="small"
+                    placeholder="选择项目收费编码"
+                    v-model="newProductData.payFeeCode"
                 ></el-input>
-                <el-button type="primary" size="mini"  style="margin-left: 10px" @click="selectPayFeecode">选入</el-button>
+                <el-button type="primary" size="mini" style="margin-left: 10px" @click="selectPayFeecode">选入</el-button>
               </el-form-item>
             </el-col>
             <el-col :span="11">
@@ -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">
@@ -323,10 +323,10 @@
                            clearable
                            placeholder="请选择流通计量层级标识">
                   <el-option
-                    v-for="item in detailList"
-                    :key="item.nameCode"
-                    :value="item.nameCode"
-                    :label="item.nameCode">
+                      v-for="item in detailList"
+                      :key="item.nameCode"
+                      :value="item.nameCode"
+                      :label="item.nameCode">
                     <span style="float: left">{{ item.nameCode }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
                   </el-option>
@@ -340,10 +340,10 @@
                            clearable
                            placeholder="请选择流通计量层级标识">
                   <el-option
-                    v-for="item in detailList"
-                    :key="item.nameCode"
-                    :value="item.nameCode"
-                    :label="item.nameCode">
+                      v-for="item in detailList"
+                      :key="item.nameCode"
+                      :value="item.nameCode"
+                      :label="item.nameCode">
                     <span style="float: left">{{ item.nameCode }}</span>
                     <span style="float: right; color: #8492a6; font-size: 13px">{{ item.packLevel }}</span>
                   </el-option>
@@ -407,9 +407,9 @@
             <el-divider direction="vertical"></el-divider>
             <el-col :span="11" class="el-col">
               <el-switch
-                v-model="status"
-                active-color="#13ce66"
-                inactive-color="#ff4949"
+                  v-model="status"
+                  active-color="#13ce66"
+                  inactive-color="#ff4949"
               >
               </el-switch>
             </el-col>
@@ -423,23 +423,23 @@
     </el-form>
     <div style="text-align: center; margin-top: 20px;">
       <el-button type="primary" @click="saveNewProduct" :loading="saveLoading">提交</el-button>
-      <el-button  @click="closeAddDialog">取消</el-button>
+      <el-button @click="closeAddDialog">取消</el-button>
     </div>
 
     <el-dialog
-      title="收费项目选入"
-      :visible.sync="tollProjectDialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      width="70%"
-      v-if="tollProjectDialogVisible"
-      append-to-body
+        title="收费项目选入"
+        :visible.sync="tollProjectDialogVisible"
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        width="70%"
+        v-if="tollProjectDialogVisible"
+        append-to-body
     >
       <!--<product-single-edit-->
       <!--  :editQuery="editSingleFormat"-->
       <!--&gt;</product-single-edit>-->
       <selectChargesProjectDialog
-        :getData="getData"
+          :getData="getData"
       >
       </selectChargesProjectDialog>
       <!--<div style="text-align: center;margin-top: 12px">-->
@@ -511,7 +511,8 @@ export default {
         useLeverCount: null,
         distributeLevelCount: null,
         useLevelUnit: null,
-
+        distributeLevel: null,
+        useLevel: null,
       },
       thirdSys: [],
       classifyList: [],
@@ -575,14 +576,14 @@ export default {
         key: key
       }
       filterClassify(query)
-        .then(response => {
-          this.loading = false
-          this.classifyList = response.data.list || []
-        })
-        .catch(() => {
-          this.loading = false
-          this.classifyList = []
-        })
+          .then(response => {
+            this.loading = false
+            this.classifyList = response.data.list || []
+          })
+          .catch(() => {
+            this.loading = false
+            this.classifyList = []
+          })
     },
     getYbHcData() {
       let query = {
@@ -633,8 +634,8 @@ export default {
               for (let i = 0; i < this.detailList.length; i++) {
                 const item = this.detailList[i];
                 if (!validateItem(item, 'nameCode', '药品层级标识不能为空！') ||
-                  !validateItem(item, 'packLevel', '包装级别不能为空') ||
-                  !validateItem(item, 'packUnit', '层级单位不能为空')) {
+                    !validateItem(item, 'packLevel', '包装级别不能为空') ||
+                    !validateItem(item, 'packUnit', '层级单位不能为空')) {
                   return;
                 }
               }
@@ -769,14 +770,14 @@ export default {
           id: this.newProductData.id
         }
         filterByUuid(query)
-          .then((response) => {
-            this.loading = false;
-            this.detailList = response.data || [];
-          })
-          .catch(() => {
-            this.loading = false;
-            this.detailList = [];
-          });
+            .then((response) => {
+              this.loading = false;
+              this.detailList = response.data || [];
+            })
+            .catch(() => {
+              this.loading = false;
+              this.detailList = [];
+            });
       }
     },
 
@@ -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 = {
@@ -809,11 +812,11 @@ export default {
     /**
      * 选择收费项目
      */
-    selectPayFeecode(){
+    selectPayFeecode() {
       this.tollProjectDialogVisible = true
     },
 
-    getData(data){
+    getData(data) {
       this.tollProjectDialogVisible = false
       this.newProductData.payFeeCode = data.medCatalogCode
     }

src/views/collect/DealOrder.vue

@@ -104,27 +104,28 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="6" >
-            <el-form-item prop="busType"  class="query-form-item" label="单据类型:">
+          <el-col :span="6">
+            <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"
@@ -270,17 +269,20 @@
         width="65%"
         append-to-body
       >
-        <el-row >
+        <el-row>
           <!--          <el-button v-for="(item, index) in busTypeList" :key="index" type="primary" plain @click="selectBusType(item.code)">{{ item.name }}</el-button>-->
 
-          <el-col v-for="(info, index)  in busTypeList"  :key="index" :xs="12" :sm="8" :md="8" :lg="6">
+          <el-col v-for="(info, index)  in busTypeList" :key="index" :xs="12" :sm="8" :md="8" :lg="6">
             <el-card :body-style="{margin:'20px'}"
                      style="margin:20px 20px 20px 20px;height: 200px;background-color: #e1f3fb;border-radius: 12px; position: relative;"
 
             >
 
-              <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>
@@ -325,7 +328,7 @@ import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
 import {getCurOrder, getNextOrder} from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
-import { getWorkBindBusTypes,removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   /**
@@ -355,7 +358,7 @@ export default {
       total: 0,
       defaultSort: {prop: 'createTime', order: 'desc'},
       formDataVisible: {
-        operationType: null,
+        scanType: null,
         unitTittle: "往来单位",
         corpType: 1,
       },
@@ -413,8 +416,7 @@ export default {
     PanelOrderAllDetail
   },
   methods: {
-    selectBusType(val){
-
+    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