界面优化

src/api/collect/collectOrder.js

@@ -83,6 +83,19 @@ export function bindWork(query) {
   });
 }
 
+export function importOrder(query) {
+  return axios({
+    url: "/udiwms/collect/order/import",
+    method: "get",
+    params: query
+  });
+}
 
-
+export function clearAllOrder(query) {
+  return axios({
+    url: "/udiwms/collect/order/clearAll",
+    method: "get",
+    params: query
+  });
+}
 

src/views/collect/CollectOrderNew.vue

@@ -93,10 +93,14 @@
           >查询
           </el-button
           >
-          <!--          <el-button type="primary" icon="el-icon-download" @click="downloadPrescription"-->
-          <!--          >下载单据-->
-          <!--          </el-button-->
-          <!--          >-->
+          <el-button type="primary" icon="el-icon-download" @click="downloadPrescription"
+          >下载单据
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-delete" @click="clearAllOrder"
+          >清除单据
+          </el-button
+          >
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
@@ -242,7 +246,7 @@ import {convertDate} from "@/utils/date";
 import {detail} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
 import prescribeOriginPanel from "./PannelOrderBiz";
-import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
+import {clearAllOrder, deleteByOrder, importOrder, orderPage} from "@/api/collect/collectOrder";
 import {filterSubAllOptimize} from "@/api/system/invSubWarehouse";
 import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
 
@@ -273,7 +277,7 @@ export default {
 
       showSearch: true,
       filterQuery: {
-        tagStatus:"1",    //
+        tagStatus: "1",    //
         billNo: null,
         page: 1,
         limit: 10,
@@ -339,16 +343,47 @@ export default {
       this.getList();
     },
     downloadPrescription() {
-      this.downloadPrescriptionVisible = true
+      // this.downloadPrescriptionVisible = true
+      this.loading = true;
+      importOrder().then(res => {
+          this.loading = false
+          if (res.code == 20000) {
+            this.$message.success("下载成功！")
+            this.getList()
+          } else {
+            this.$message.error(res.message)
+          }
+        }
+      ).catch(() => {
+        this.loading = false
+      })
     },
+
+    clearAllOrder() {
+      this.loading = true;
+      clearAllOrder().then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.$message.success("清除成功！")
+          this.getList()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    }
+    ,
     closeDialog() {
       this.downloadPrescriptionVisible = false;
       this.getList();
-    },
+    }
+    ,
     onSubmit() {
       this.filterQuery.page = 1;
       this.getList();
-    },
+    }
+    ,
 
     getList() {
       this.loading = true;
@@ -361,22 +396,26 @@ export default {
         this.list = []
         this.total = 0
       })
-    },
+    }
+    ,
     handleCurrentChange(val) {
       this.filterQuery.page = val.page;
       this.getList();
-    },
+    }
+    ,
 
     prescribeClick(_this, row) {
       _this.curRow = row;
       _this.refreshCodesPanel(_this);
-    },
+    }
+    ,
     refreshCodesPanel(_this) {
       _this.panelALive = false;
       _this.$nextTick(() => {
         _this.panelALive = true;
       });
-    },
+    }
+    ,
 
     deleteDialog(_this, row) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
@@ -389,7 +428,8 @@ export default {
         })
         .catch(() => {
         });
-    },
+    }
+    ,
     deleteOrders(data) {
       this.loading = true;
       this.deleteData.billNo = data;
@@ -412,7 +452,8 @@ export default {
         })
         .catch(() => {
         });
-    },
+    }
+    ,
 
 
   },

src/views/collect/DealOrder.vue

@@ -45,19 +45,19 @@
                 type="primary"
                 :disabled="isSelectOrder"
                 @click.native="selectPrescribe()"
-              >选入单据
+              >选入单据1
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="saveDraftOrder()"
-              >单据挂起
+              >单据挂起1
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="finishOrder()"
-              >处理完成
+              >处理完成1
               </el-button>
 
               <el-dropdown @command="handleCommand">
@@ -216,6 +216,7 @@
         append-to-body
       >
         <selectPrescribeDialog
+          :workPlaceCode="this.formData.workPlaceCode"
           :confirmSelect="this.confirmSelect"
           :closeDialog="this.closeDialog"
         ></selectPrescribeDialog>
@@ -521,6 +522,7 @@ export default {
 
     //选择单据
     selectPrescribe() {
+      console.log(this.formData.workPlaceCode)
       this.selectPrescriptionVisible = true;
     },
 

src/views/collect/DealOrderBlank.vue

@@ -38,26 +38,26 @@
               <el-button
                 type="primary"
                 :disabled="isSelectOrder"
-                @click.native="selectPrescribe()"
+                @click.native="nextCollectOrder()"
               >下一单据
               </el-button>
               <el-button
                 type="primary"
                 :disabled="isSelectOrder"
                 @click.native="selectPrescribe()"
-              >选入单据
+              >选入单据1
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="saveDraftOrder()"
-              >单据挂起
+              >单据挂起1
               </el-button>
               <el-button
                 type="primary"
                 :disabled="formData.tagStatus<2"
                 @click.native="finishOrder()"
-              >处理完成
+              >处理完成1
               </el-button>
 
               <el-dropdown @command="handleCommand">
@@ -216,6 +216,7 @@
         append-to-body
       >
         <selectPrescribeDialog
+          :workPlaceCode="this.formData.workPlaceCode"
           :confirmSelect="this.confirmSelect"
           :closeDialog="this.closeDialog"
         ></selectPrescribeDialog>
@@ -234,9 +235,10 @@ import prescribeCodePanel from "./PanelOrderTagCode";
 import PannelOrderBiz from "./PannelOrderBiz";
 import {listPage} from "@/api/basic/sysWorkplaceManage";
 import {enterCodeWeb} from "@/api/inout/order";
-import {draftOrder, finishOrder, tagCode} from "@/api/collect/splitCreateOrder";
+import {draftOrder, finishOrder, startSplit, tagCode} from "@/api/collect/splitCreateOrder";
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
+import {getNextOrder} from "@/api/collect/collectOrder";
 
 export default {
   /**
@@ -265,7 +267,7 @@ export default {
       list: [],
       total: 0,
       defaultSort: {prop: 'createTime', order: 'desc'},
-      formDataVisible:{
+      formDataVisible: {
         operationType: null,
         unitTittle: "往来单位",
         corpType: 1,
@@ -309,7 +311,7 @@ export default {
   methods: {
     findFromInvList(val) {
       let cQuery = {
-        corpType:this.formDataVisible.corpType,
+        corpType: this.formDataVisible.corpType,
       };
       selectCorpList(cQuery)
         .then((response) => {
@@ -318,10 +320,13 @@ export default {
         .catch(() => {
         });
     },
-    workPlaceCodeChange(value){
-      this.curWorkPlaces.forEach(item => {if(item.workplaceId == value){ this.formDataVisible =  item
-      } })
-      if (this.formDataVisible.operationType == 1){
+    workPlaceCodeChange(value) {
+      this.curWorkPlaces.forEach(item => {
+        if (item.workplaceId == value) {
+          this.formDataVisible = item
+        }
+      })
+      if (this.formDataVisible.operationType == 1) {
         this.findFromInvList("");
       }
       return
@@ -355,7 +360,7 @@ export default {
       }
       listPage(query).then((res) => {
         this.curWorkPlaces = res.data.list || [];
-        if (this.curWorkPlaces.length == 1  && this.formData.workPlaceCode == null) {
+        if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) {
           this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
         }
         this.workPlaceCodeChange(this.formData.workPlaceCode);
@@ -454,12 +459,13 @@ export default {
     addCode() {
       if (this.$isBlank(this.filterQuery.code)) {
         this.filterQuery.code = this.scanCode.trim();
-        return;
       }
       if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
         return;
       }
       let tagQuery = {
+        workPlaceCode: this.formData.workPlaceCode,
+        fromCorp: this.formData.fromCorp,
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
       };
@@ -468,6 +474,7 @@ export default {
         if (res.code == 20000) {
           this.formData.tagStatus = 2;
           this.formData = res.data;
+          this.refreshCodesPanel(this);
         } else {
           this.$message.error(res.message)
         }
@@ -513,10 +520,27 @@ export default {
 
     },
 
+    //选择单据
     selectPrescribe() {
+      console.log(this.formData.workPlaceCode)
       this.selectPrescriptionVisible = true;
     },
 
+    //获取下一单据
+    nextCollectOrder() {
+      getNextOrder(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.formData = res.data;
+          this.dealSplitOrder()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
     closeDialog() {
       this.selectPrescriptionVisible = false;
     },
@@ -525,9 +549,27 @@ export default {
       this.selectPrescriptionVisible = false;
       this.formData = row;
       this.curRow = row;
+      this.dealSplitOrder()
       this.refreshCodesPanel(this);
     },
 
+    //开始拆零
+    dealSplitOrder() {
+      startSplit(this.formData).then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          console.log(res.data)
+          this.refreshCodesPanel(this);
+        } else {
+          console.log(res.message)
+
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+
+
     printCodeResult(data, isSuccess) {
       const resultParts = ["追溯码：" + data.code + "\r\n"];
 

src/views/collect/prescribe/prescribeOriginPanel.vue

@@ -220,7 +220,7 @@ export default {
 
   },
   created() {
-    getHead("prescribeOriginPanel", "1").then((re) => {
+    getHead("selectTagPrescribe-1", "1").then((re) => {
       // 处理返回的数据
       this.tableObj1 = re.data;
       this.tableHeader1 = re.data.tableList;

src/views/collect/selectCollectOrderDialog.vue

@@ -9,11 +9,11 @@
                           class="query-form-item"
                           :label="item.columnDesc+`:`" :key="item.id">
               <el-input
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                clearable
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
               ></el-input>
             </el-form-item>
             <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
@@ -24,10 +24,10 @@
                          :disabled="executeEval(null,item.disabledFuc,false)"
                          clearable>
                 <el-option
-                  v-for="dict in item.lableRuleObj"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
                 />
               </el-select>
             </el-form-item>
@@ -35,19 +35,19 @@
                           class="query-form-item"
                           :label="item.columnDesc+`:`">
               <el-select
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                @change="executeFuc($event,'5',item.checkRules)"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                filterable
-                remote
-                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                clearable>
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
                 <el-option
-                  v-for="item in options[item.clickFuc]"
-                  :key="item.code"
-                  :label="item.label"
-                  :value="item.code"
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
                 />
               </el-select>
             </el-form-item>
@@ -55,26 +55,26 @@
                           class="query-form-item"
                           :label="item.columnDesc+`:`">
               <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
             <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
                           class="query-form-item"
                           :label="item.columnDesc+`:`">
               <el-date-picker
-                v-model="filterQuery[item.columnName]"
-                :style="`width:${item.width+'px'}`"
-                value-format="yyyy-MM-dd"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                type="date"
-                :placeholder="item.columnDesc"
+                  v-model="filterQuery[item.columnName]"
+                  :style="`width:${item.width+'px'}`"
+                  value-format="yyyy-MM-dd"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  type="date"
+                  :placeholder="item.columnDesc"
               ></el-date-picker>
             </el-form-item>
           </template>
@@ -84,9 +84,9 @@
         <el-button-group>
           <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
           <el-button
-            type="primary"
-            icon="el-icon-refresh"
-            @click="onReset"
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
           >重置
           </el-button>
           <el-button type="primary" icon="el-icon-search" @click="onSubmit"
@@ -111,36 +111,36 @@
 
         <template v-for="(item, index) in tableHeader">
           <el-table-column
-            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-            type="index" :label="item.columnDesc"></el-table-column>
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
           <el-table-column
-            v-if="item.columnType == 'selection'"
-            type="selection"
-            :width="item.width"
-            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
           ></el-table-column>
 
           <el-table-column
-            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
           >
             <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
           <el-table-column
-            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
           >
             <template slot-scope="scope">
             <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
@@ -149,17 +149,17 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
           >
             <template slot-scope="scope">
               <el-tag
-                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
               <span>{{
                   item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
                 }}</span>
@@ -167,12 +167,12 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :width="item.width"
-            :key="item.columnName"
-            fixed="right"
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
           >
             <template slot-scope="scope">
               <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
@@ -188,13 +188,13 @@
             </template>
           </el-table-column>
           <el-table-column
-            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-            :prop="item.columnName"
-            :label="item.columnDesc"
-            :sortable="item.sort"
-            :width="item.width"
-            :show-overflow-tooltip="item.tooltip"
-            :key="item.columnName"
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
           >
             <template slot-scope="scope">
             <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
@@ -206,18 +206,18 @@
       </el-table>
 
       <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
       ></pagination>
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
       <el-tab-pane label="单据明细">
         <prescribeOriginPanel
-          v-if="panelALive"
-          :prescribeData="curRow"
+            v-if="panelALive"
+            :prescribeData="curRow"
         ></prescribeOriginPanel>
       </el-tab-pane>
     </el-tabs>
@@ -231,7 +231,6 @@ import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
-import {page as prescribePage} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
 import prescribeOriginPanel from "./PannelOrderBiz";
 import {orderPage} from "@/api/collect/collectOrder";
@@ -247,6 +246,10 @@ export default {
       type: Function,
       required: true,
     },
+    workPlaceCode: {
+      type: String,
+      required: true,
+    },
   },
   data() {
     return {
@@ -325,6 +328,10 @@ export default {
 
     getList() {
       this.loading = true;
+      this.filterQuery.workPlaceCode = this.workPlaceCode
+      console.log(this.filterQuery.workPlaceCode)
+      console.log(this.workPlaceCode)
+      debugger
       orderPage(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []