单据流转与单据查询相关修改

src/views/inout/DialogCreateOrder.vue

@@ -382,6 +382,7 @@ export default {
     getBusTypeByInv() {
       let query = {
         code: this.orderFormData.invCode,
+        busType: 2,//默认只能选择送货单
       };
       findByInvUser(query)
         .then((response) => {
@@ -449,7 +450,7 @@ export default {
         this.bizShow = false;
       if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
         //1.切换往来单位
-        if(!this.isSupVesion){
+        if (!this.isSupVesion) {
           this.orderFormData.fromCorp = null;
           this.findMethod();
         }

src/views/inout/InvoiceRegistration.vue

@@ -291,13 +291,13 @@
 <script>
 import {
   deleteByOrderId,
-  getOrderList, rollUnReceivebackOrder,filterInvoice
+  getOrderList, rollUnReceivebackOrder, filterInvoice
 } from "../../api/inout/order";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {getInvListByUser} from "@/api/system/invWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
-import { filterListInvoice, getBizDetailList ,deleteById} from '@/api/inout/orderDetailBiz'
+import {filterListInvoice, getBizDetailList, deleteById} from '@/api/inout/orderDetailBiz'
 import {getCodeList} from "@/api/inout/code";
 import AcceptOrder from "@/views/inout/DialogReviewOrder";
 import DialogInvoice from "@/views/inout/DialogInvoice";
@@ -335,8 +335,8 @@ export default {
         1: "发票登记"
       },
       certFileUrl: "",
-      Upinvoice:false,
-      InvoiceRegisterv:false,
+      Upinvoice: false,
+      InvoiceRegisterv: false,
       checkStatus: {
         1: "草稿",
         2: "等待处理",
@@ -445,7 +445,7 @@ export default {
       acceptOrderVisible: false,
     };
   },
-  components: {AcceptOrder,DialogInvoice,InvoiceRegister},
+  components: {AcceptOrder, DialogInvoice, InvoiceRegister},
   methods: {
     onReset() {
       this.$router.push({
@@ -464,9 +464,9 @@ export default {
       };
       this.getList();
     },
-    InvoiceRegister(row){
-      this.inputQueryId=row.billNo;
-      this.InvoiceRegisterv=true;
+    InvoiceRegister(row) {
+      this.inputQueryId = row.billNo;
+      this.InvoiceRegisterv = true;
     },
     onSubmit() {
       this.loading = true;
@@ -483,7 +483,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    toViewCompanyCert(row){
+    toViewCompanyCert(row) {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       window.open(this.certFileUrl + row.licenseUrl);
     },
@@ -491,8 +491,8 @@ export default {
       this.filterQuery.action = null;
       this.getBusType();
     },
-    freshen(){
-      this.Upinvoice=false;
+    freshen() {
+      this.Upinvoice = false;
       this.getBizDetailList();
     },
     printOrder(row) {
@@ -512,14 +512,14 @@ export default {
         });
     },
 
-    deleteInvoice(row){
+    deleteInvoice(row) {
       this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          let params={id:row}
+          let params = {id: row}
           deleteById(params)
             .then((response) => {
               if (response.code == 20000) {
@@ -564,6 +564,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
+      this.filterQuery.busType = 2;   //默认只查询送货单
       filterInvoice(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -684,11 +685,11 @@ export default {
     //验收结束
     closeAcceptDialog() {
       this.Upinvoice = false;
-      this. getBizDetailList();
+      this.getBizDetailList();
     },
 
-    closeInvoice(){
-      this.InvoiceRegisterv=false;
+    closeInvoice() {
+      this.InvoiceRegisterv = false;
       this.getBizDetailList();
     },
 

src/views/inout/IoArrivalSearchOrder.vue

@@ -144,7 +144,7 @@
             <el-button
               type="text"
               size="small"
-              v-if="customerId == 110"
+              v-if="customerId == 110 && scope.row.status == 5"
               @click.native.stop="reviewOrder(scope.row)"
             >审核
             </el-button

src/views/inout/IoInoutSearchOrder.vue

@@ -144,7 +144,7 @@
             <el-button
               type="text"
               size="small"
-              v-if="customerId == 110"
+              v-if="customerId == 110 && scope.row.status == 5"
               @click.native.stop="reviewOrder(scope.row)"
             >审核
             </el-button
@@ -473,14 +473,14 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "checkSuccess",
+        statusType: "supSearch",
         page: 1,
         limit: 10,
         startTime: null,
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       },
-      customerId:this.$store.getters.customerId,
+      customerId: this.$store.getters.customerId,
       checkStatus: {
         1: "草稿",
         2: "等待处理",
@@ -600,7 +600,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "checkSuccess",
+        statusType: "supSearch",
         page: 1,
         limit: 10,
         startTime: null,
@@ -706,6 +706,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
+      this.filterQuery.busType = 1;
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;

src/views/inout/IoSupSearchOrder.vue

@@ -548,6 +548,7 @@ export default {
       this.loading = true;
       this.currentRow = {billNo: ""};
       this.clearDetailList();
+      this.filterQuery.busType = 2;
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -795,9 +796,7 @@ export default {
       return statusMap[status];
     },
   },
-  filters: {
-
-  },
+  filters: {},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();

src/views/system/param/busTypeChange.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form :inline="true"  class="query-form" size="mini">
+      <el-form :inline="true" class="query-form" size="mini">
         <el-form-item class="query-form-item" label="单据类型名称:">
           <el-input
             v-model="filterQuery.originName"
@@ -25,9 +25,11 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="补单类型名称" prop="originName"></el-table-column>
-        <el-table-column label="补单类型代码" prop="originAction"></el-table-column>
-        <el-table-column label="目标单据类型" prop="targetBusName"></el-table-column>
+        <el-table-column label="业务单" prop="originName"></el-table-column>
+        <el-table-column label="目标业务单" prop="targetBusName"></el-table-column>
+        <el-table-column label="时间间隔(h)" prop="beforeTime"></el-table-column>
+        <el-table-column label="目标出入库单" prop="targetBusName"></el-table-column>
+        <el-table-column label="时间间隔(h)" prop="busBeforeTime"></el-table-column>
         <el-table-column label="类型" prop="type">
           <template slot-scope="scope">
             <span>{{ typeMap[scope.row.type] }}</span>
@@ -253,7 +255,9 @@ export default {
         targetAction: null,
         name: null,
         enable: null,
-        remark: null
+        remark: null,
+        auditStatus: null,
+        busAuditStatus: null,
       };
       this.modifyDialogVisible = true;
     },

src/views/system/param/busTypeChangeModify.vue

@@ -4,34 +4,96 @@
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="单据类型名称" prop="originName">
-            <el-input v-model="inputQuery.originName" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input>
+            <el-input v-model="inputQuery.originName" :disabled="!isAdd" size="small" placeholder="请输入内容"
+                      style="width: 90%"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="11">
           <el-form-item label="单据类型代码" prop="originAction">
-            <el-input v-model="inputQuery.originAction" :disabled="!isAdd" size="small" placeholder="请输入内容" style="width: 90%"></el-input>
+            <el-input v-model="inputQuery.originAction" :disabled="!isAdd" size="small" placeholder="请输入内容"
+                      style="width: 90%"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
 
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="目标单据类型" prop="targetAction">
+          <el-form-item label="目标出入库单" prop="targetIoAction">
             <el-select v-model="inputQuery.targetAction" placeholder="请选择" clearable size="small" style="width: 90%">
               <el-option
-                v-for="item in busTypes"
+                v-for="item in targetTypes"
                 :key="item.action"
                 :label="item.name"
                 :value="item.action">
-                <span style="float: left"> {{item.name}}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{item.action}}</span>
+                <span style="float: left"> {{ item.name }}</span>
               </el-option>
-
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="11">
+          <el-form-item label="目标业务单" prop="targetBusAction">
+            <el-select v-model="inputQuery.targetBusAction" placeholder="请选择" clearable size="small" style="width: 90%">
+              <el-option
+                v-for="item in targetBusTypes"
+                :key="item.originAction"
+                :label="item.originName"
+                :value="item.originAction">
+                <span style="float: left"> {{ item.originName }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="时间间隔(h)" prop="beforeTime">
+            <el-input style="width: 90%"
+                      size="small"
+                      type="number"
+                      placeholder="请输入出入库单时间间隔"
+                      v-model="inputQuery.beforeTime"
+                      onkeyup="this.value=this.value.replace(/\D/g,'')"
+                      onafterpaste="this.value=this.value.replace(/\D/g,'')"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="时间间隔（h）" prop="busBeforeTime">
+            <el-input style="width: 90%"
+                      size="small"
+                      type="number"
+                      placeholder="请输入业务单时间间隔"
+                      v-model="inputQuery.busBeforeTime"
+                      onkeyup="this.value=this.value.replace(/\D/g,'')"
+                      onafterpaste="this.value=this.value.replace(/\D/g,'')"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="出入库单审核状态" prop="auditStatus" class="query-form-item">
+            <el-radio-group v-model="inputQuery.auditStatus">
+              <el-radio :label="1">草稿</el-radio>
+              <el-radio :label="2">待审核</el-radio>
+              <el-radio :label="3">已审核</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="业务单审核状态" prop="busAuditStatus" class="query-form-item">
+            <el-radio-group v-model="inputQuery.busAuditStatus">
+              <el-radio :label="1">草稿</el-radio>
+              <el-radio :label="2">待审核</el-radio>
+              <el-radio :label="3">已审核</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
+      <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="启用状态" prop="enable">
             <el-select v-model="inputQuery.enable"
@@ -39,15 +101,12 @@
                        placeholder="启用状态"
                        style="width: 90%"
                        clearable
-                       >
+            >
               <el-option label="启用" :value="true"></el-option>
               <el-option label="禁用" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="类型">
             <el-select v-model="inputQuery.type"
@@ -59,6 +118,7 @@
               <el-option label="耗材领用" :value="1"></el-option>
               <el-option label="产品申购" :value="2"></el-option>
               <el-option label="采购计划" :value="3"></el-option>
+              <el-option label="采购订单" :value="5"></el-option>
               <el-option label="盘点转单" :value="4"></el-option>
             </el-select>
           </el-form-item>
@@ -81,7 +141,8 @@
 
 <script>
 
-import {getBusTypeList} from "@/api/basic/busType";
+import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
+import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
 
 export default {
   name: "BusTypePreModify",
@@ -98,7 +159,8 @@ export default {
         enabled: true,
         isBuType: true,
       },
-      busTypes: [],
+      targetTypes: [],
+      targetBusTypes: [],
       isAdd: false,
       formRules: {
         originName: [
@@ -152,17 +214,30 @@ export default {
       };
       getBusTypeList(params).then((res) => {
         if (res.code === 20000) {
-          this.busTypes = res.data.list || [];
+          this.targetTypes = res.data.list || [];
         }
       })
-    }
+    },
+    getTargetBusType() {
+      let query = {
+        enable: true
+      };
+      getBusTypeChangeList(query).then((res) => {
+        if (res.code === 20000) {
+          this.targetBusTypes = res.data.list || [];
+        }
+      })
+    },
   },
 
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;
+      this.inputQuery.auditStatus  = 2;
+      this.inputQuery.busAuditStatus  = 2;
     }
     this.getBusType();
+    this.getTargetBusType();
   }
 }
 </script>

src/views/system/param/busTypePre.vue

@@ -27,12 +27,14 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="原单据类型" prop="originName"></el-table-column>
-        <el-table-column label="目标单据类型" prop="targetName"></el-table-column>
+        <el-table-column label="出入库单" prop="originName"></el-table-column>
+        <el-table-column label="目标出入库单" prop="targetName"></el-table-column>
+        <el-table-column label="时间间隔(h)" prop="beforeTime"></el-table-column>
+        <el-table-column label="目标业务单" prop="targetBusName"></el-table-column>
+        <el-table-column label="时间间隔(h)" prop="busBeforeTime"></el-table-column>
         <el-table-column label="目标当前仓库" prop="invName"></el-table-column>
         <el-table-column label="目标往来仓库" prop="defaultInvName"></el-table-column>
-        <el-table-column label="时间推移（小时）" prop="beforeTime"></el-table-column>
-        <el-table-column label="补单方式" prop="supplementAll">
+        <el-table-column label="流转方式" prop="supplementAll">
           <template slot-scope="scope">
             <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
@@ -120,7 +122,9 @@ export default {
         beforeTime: null,
         supplementAll: null,
         intro: null,
-        remark: null
+        remark: null,
+        auditStatus: null,
+        busAuditStatus: null,
       },
       enableMap: {
         true: "全量补单",
@@ -184,18 +188,18 @@ export default {
         this.$message.error("原单据类型不能为空！");
         return;
       }
-      if (isBlank(this.inputQuery.action)) {
-        this.$message.error("目标单据类型不能为空！")
+      if (isBlank(this.inputQuery.action) && isBlank(this.inputQuery.targetBusAction)) {
+        this.$message.error("目标出入库单与目标业务单不能同时为空！")
         return;
       }
       if (isBlank(this.inputQuery.invCode)) {
         this.$message.error("目标所在仓库不能为空！")
         return;
       }
-      if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
-        this.$message.error("推移时间不能小于0！");
-        return;
-      }
+      // if (!isBlank(this.inputQuery.beforeTime) && this.inputQuery.beforeTime < 0) {
+      //   this.$message.error("推移时间不能小于0！");
+      //   return;
+      // }
 
       if (this.formName === "add") {
         let numRegExp = '^[0-9]*$';
@@ -210,7 +214,7 @@ export default {
             this.loading = false;
             this.cancelDialog();
             this.getList();
-          }else{
+          } else {
             this.$message.error(res.message);
           }
         }).catch(() => {
@@ -243,7 +247,9 @@ export default {
         beforeTime: null,
         supplementAll: null,
         intro: null,
-        remark: null
+        remark: null,
+        auditStatus: null,
+        busAuditStatus: null,
       };
       this.modifyDialogVisible = true;
     },

src/views/system/param/busTypePreModify.vue

@@ -3,7 +3,7 @@
     <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="120px" border>
       <el-row type="flex">
         <el-col :span="11">
-          <el-form-item label="原单据类型" prop="originAction">
+          <el-form-item label="出入库单" prop="originAction">
             <el-select v-model="inputQuery.originAction" placeholder="原单据类型" clearable size="small"
                        style="width: 90%">
               <el-option
@@ -19,22 +19,17 @@
         </el-col>
 
         <el-col :span="11">
-          <el-form-item label="目标单据类型" prop="action">
-            <el-select v-model="inputQuery.action" placeholder="目标单据类型" clearable size="small" style="width: 90%">
-              <el-option
-                v-for="item in targetBusTypes"
-                :key="item.action"
-                :label="item.name"
-                :value="item.action">
-                <span style="float: left"> {{ item.name }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>
-              </el-option>
-
+          <el-form-item label="流转方式" prop="supplementAll">
+            <el-select v-model="inputQuery.supplementAll" placeholder="流转方式" clearable size="small"
+                       style="width: 90%">
+              <el-option label="全量补单" :value="true"></el-option>
+              <el-option label="自动补单" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
 
+
       <el-row type="flex">
         <el-col :span="11">
           <el-form-item label="目标所在仓库" prop="invCode">
@@ -69,9 +64,46 @@
         </el-col>
       </el-row>
 
-      <el-row type="flex">
+
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="目标出入库单" prop="action">
+            <el-select v-model="inputQuery.action" placeholder="目标出入库单" clearable size="small" style="width: 90%">
+              <el-option
+                v-for="item in targetTypes"
+                :key="item.action"
+                :label="item.name"
+                :value="item.action">
+                <span> {{ item.name }}</span>
+              </el-option>
+
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="11">
+          <el-form-item label="目标业务单" prop="action">
+            <el-select v-model="inputQuery.targetBusAction" placeholder="目标业务单" clearable size="small"
+                       style="width: 90%">
+              <el-option
+                v-for="item in targetBusTypes"
+                :key="item.originAction"
+                :label="item.originName"
+                :value="item.originAction">
+                <span> {{ item.originName }}</span>
+              </el-option>
+
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+
+      </el-row>
+
+
+      <el-row>
         <el-col :span="11">
-          <el-form-item label="推移时间（小时）" prop="beforeTime">
+          <el-form-item label="时间间隔（h）" prop="beforeTime">
             <el-input style="width: 90%"
                       size="small"
                       type="number"
@@ -84,16 +116,42 @@
         </el-col>
 
         <el-col :span="11">
-          <el-form-item label="流转方式" prop="supplementAll">
-            <el-select v-model="inputQuery.supplementAll" placeholder="流转方式" clearable size="small"
-                       style="width: 90%">
-              <el-option label="全量补单" :value="true"></el-option>
-              <el-option label="自动补单" :value="false"></el-option>
-            </el-select>
+          <el-form-item label="时间间隔（h）" prop="beforeTime">
+            <el-input style="width: 90%"
+                      size="small"
+                      type="number"
+                      placeholder="请输入内容"
+                      v-model="inputQuery.busBeforeTime"
+                      onkeyup="this.value=this.value.replace(/\D/g,'')"
+                      onafterpaste="this.value=this.value.replace(/\D/g,'')"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+      <el-row>
+        <el-col :span="11">
+          <el-form-item label="出入库单审核状态" prop="auditStatus" class="query-form-item">
+            <el-radio-group v-model="inputQuery.auditStatus">
+              <el-radio :label="1">草稿</el-radio>
+              <el-radio :label="2">待审核</el-radio>
+              <el-radio :label="3">已审核</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="11">
+          <el-form-item label="业务单审核状态" prop="busAuditStatus" class="query-form-item">
+            <el-radio-group v-model="inputQuery.busAuditStatus">
+              <el-radio :label="1">草稿</el-radio>
+              <el-radio :label="2">待审核</el-radio>
+              <el-radio :label="3">已审核</el-radio>
+            </el-radio-group>
           </el-form-item>
         </el-col>
       </el-row>
 
+
       <el-row type="flex">
         <el-col :span="23" type="flex">
           <el-form-item prop="intro">
@@ -113,6 +171,7 @@
 import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
 import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
+import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
 
 export default {
   name: "BusTypePreModify",
@@ -130,6 +189,7 @@ export default {
         isBuType: true,
       },
       originBusTypes: [],
+      targetTypes: [],
       targetBusTypes: [],
       locInvs: [],
       fromInvs: [],
@@ -194,6 +254,18 @@ export default {
         enable: true
       };
       getBusTypeListByUser(query).then((res) => {
+        if (res.code === 20000) {
+          this.targetTypes = res.data.list || [];
+        }
+      })
+    },
+
+
+    getTargetChangeType() {
+      let query = {
+        enable: true
+      };
+      getBusTypeChangeList(query).then((res) => {
         if (res.code === 20000) {
           this.targetBusTypes = res.data.list || [];
         }
@@ -227,7 +299,7 @@ export default {
         this.getTargetBusType();
       } else {
         this.inputQuery.action = null;
-        this.targetBusTypes = [];
+        this.targetTypes = [];
       }
     },
   },
@@ -235,9 +307,14 @@ export default {
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;
+      this.inputQuery.auditStatus = 2;
+      this.inputQuery.busAuditStatus = 2;
     } else {
       this.getTargetBusType();
     }
+
+    this.getTargetChangeType();
+
     this.getOriginBusType();
     this.getLocInv();
     this.getFromInv();