9/18 现场管理优化

src/views/basic/collectPoint/userWorkplace.vue

@@ -402,7 +402,8 @@ export default {
       this.userQuery = {
         page: 1,
         limit: 10,
-        key: ''
+        key: '',
+        deptCode: this.$store.getters.locDeptCode,
       }
       this.getUsers()
     },

src/views/collect/CollectOrderNew.vue

@@ -372,7 +372,7 @@
       :close-on-click-modal="false"
       :close-on-press-escape="false"
       v-if="downloadPrescriptionVisible"
-      width="65%"
+      width="75%"
       append-to-body
     >
       <prescribeDownloadDialog

src/views/collect/DealOrder.vue

@@ -220,7 +220,8 @@
         </div>
         <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
           <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
-          <el-descriptions-item label="往来信息">{{ formData.fromCorpName }}</el-descriptions-item>
+          <el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
+          <el-descriptions-item label="收货方">{{ formData.fromCorpName }}</el-descriptions-item>
           <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
           <el-descriptions-item label="来源系统">{{ formData.fromType }}</el-descriptions-item>
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>

src/views/collect/prescribe/prescribeDownloadDialog.vue

@@ -111,7 +111,7 @@
       <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
                 ref="multipleTable"
                 :default-sort="defaultSort"
-                :row-style="{ height: '32px' }" @selection-change="handleUserSelectionChange">
+                :row-style="{ height: '32px' }" @selection-change="handleUserSelectionChange"  @row-click="prescribeClick">
         <el-table-column type="selection" width="55"></el-table-column>
         <template v-for="(item, index) in tableHeader">
           <el-table-column
@@ -217,6 +217,14 @@
         @pagination="handleCurrentChange"
       ></pagination>
     </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+      <el-tab-pane label="单据明细">
+        <PannelOriginOrderDetail
+          v-if="panelALive"
+          :prescribeData="curRow"
+        ></PannelOriginOrderDetail>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
@@ -226,6 +234,7 @@ import {executeFuc, getHead} from "@/utils/customConfig";
 import {deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
 import {getThrOrderPage} from "@/api/collect/collectOrder";
 import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import PannelOriginOrderDetail from "../PannelOriginOrderDetail"
 
 export default {
   name: "prescribeDownloadDialog",
@@ -235,6 +244,7 @@ export default {
       required: true,
     },
   },
+  components:{PannelOriginOrderDetail},
   data() {
     return {
       actDateRange: [],
@@ -316,6 +326,8 @@ export default {
         page: 1,
         limit: 10,
       },
+      panelALive:false,
+      curRow: null,
     }
   },
   methods: {
@@ -421,9 +433,15 @@ export default {
       this.getList();
     },
 
-    prescribeClick(_this, row) {
+    // prescribeClick(_this, row) {
-      this.getPrescribeDetail(_this, row)
+    //   this.getPrescribeDetail(_this, row)
-      this.getCodeDetail(_this, row)
+    //   this.getCodeDetail(_this, row)
+    //   _this.curRow = row;
+    //   _this.refreshCodesPanel(_this);
+    // },
+    prescribeClick(row) {
+      this.curRow = row;
+      this.refreshCodesPanel();
     },
 
     getPrescribeDetail(_this, row) {
@@ -487,7 +505,7 @@ export default {
         .catch(() => {
         });
     },
-      getWorkBindBusTypes(_this) {
+    getWorkBindBusTypes(_this) {
         getWorkBindBusTypes(this.busQuery).then(res => {
           if (res.code == 20000) {
             let busTypes = res.data.list || [];
@@ -503,7 +521,12 @@ export default {
           return
         })
       },
-
+    refreshCodesPanel() {
+      this.panelALive = false;
+      this.$nextTick(() => {
+        this.panelALive = true;
+      });
+    }
   },
   created() {
     getHead("prescribePanel-online", "1").then((re) => {