From 6d991eb1a5988585d5ef00fd2baf704fe6c1f77d Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Sun, 19 Mar 2023 09:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=B5=81=E8=BD=AC=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/busType/busTypeAdvancedSettings.vue |   8 +-
 src/views/system/param/busTypeChange.vue      |  17 ++-
 src/views/system/param/busTypePre.vue         |  42 +++++--
 src/views/system/param/busTypePreModify.vue   | 109 ++++++++----------
 4 files changed, 98 insertions(+), 78 deletions(-)

diff --git a/src/views/basic/busType/busTypeAdvancedSettings.vue b/src/views/basic/busType/busTypeAdvancedSettings.vue
index 25ad707..3684c7d 100644
--- a/src/views/basic/busType/busTypeAdvancedSettings.vue
+++ b/src/views/basic/busType/busTypeAdvancedSettings.vue
@@ -544,7 +544,7 @@
             <i class="el-icon-setting"></i>
             设置项
           </template>
-          自动补单
+          缺量补单
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
@@ -561,7 +561,7 @@
             <i class="el-icon-tickets"></i>
             描述
           </template>
-          自动补单
+          缺量补单
         </el-descriptions-item>
 
         <el-descriptions-item>
@@ -804,7 +804,7 @@
             <i class="el-icon-setting"></i>
             设置项
           </template>
-          自动补单
+          缺量补单
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
@@ -821,7 +821,7 @@
             <i class="el-icon-tickets"></i>
             描述
           </template>
-          自动补单
+          缺量补单
         </el-descriptions-item>
 
         <el-descriptions-item>
diff --git a/src/views/system/param/busTypeChange.vue b/src/views/system/param/busTypeChange.vue
index baa19a2..1c05d41 100644
--- a/src/views/system/param/busTypeChange.vue
+++ b/src/views/system/param/busTypeChange.vue
@@ -26,10 +26,19 @@
       <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="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="出入库单" header-align="center">
+          <el-table-column label="目标业务单" prop="targetBusName"></el-table-column>
+          <el-table-column label="时间间隔(h)" prop="busBeforeTime"></el-table-column>
+
+        </el-table-column>
+
+        <el-table-column label="业务单" header-align="center">
+          <el-table-column label="目标出入库单" prop="targetBusName"></el-table-column>
+          <el-table-column label="时间间隔(h)" prop="beforeTime"></el-table-column>
+
+        </el-table-column>
+
         <el-table-column label="类型" prop="type">
           <template slot-scope="scope">
             <span>{{ typeMap[scope.row.type] }}</span>
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 77a51a1..313118f 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -28,13 +28,29 @@
       <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="时间间隔(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="supplementAll">
+        <el-table-column label="出入库单" header-align="center">
+          <el-table-column label="目标出入库单" prop="targetName"></el-table-column>
+          <el-table-column label="时间间隔(h)" prop="beforeTime"></el-table-column>
+          <el-table-column label="单据状态" prop="supplementAll">
+            <template slot-scope="scope">
+              <span>{{ orderStatus[scope.row.auditStatus] }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="业务单" header-align="center">
+          <el-table-column label="目标业务单" prop="targetBusName"></el-table-column>
+          <el-table-column label="时间间隔(h)" prop="busBeforeTime"></el-table-column>
+          <el-table-column label="单据状态" prop="supplementAll">
+            <template slot-scope="scope">
+              <span>{{ orderStatus[scope.row.busAuditStatus] }}</span>
+            </template>
+          </el-table-column>
+        </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="supplementAll">
           <template slot-scope="scope">
             <span>{{ enableMap[scope.row.supplementAll] }}</span>
           </template>
@@ -128,13 +144,19 @@ export default {
       },
       enableMap: {
         true: "全量补单",
-        false: "自动补单",
+        false: "缺量补单",
+      },
+
+      orderStatus: {
+        1: "草稿",
+        2: "待审核",
+        3: "已审核"
       },
       total: 0,
       loading: false,
       formMap: {
-        add: "新增单据流转设置",
-        edit: "编辑单据流转设置",
+        add: "新增出入库单据流转设置",
+        edit: "编辑出入库单据流转设置",
       },
       formName: null,
     };
diff --git a/src/views/system/param/busTypePreModify.vue b/src/views/system/param/busTypePreModify.vue
index 2f52ff2..2d851ae 100644
--- a/src/views/system/param/busTypePreModify.vue
+++ b/src/views/system/param/busTypePreModify.vue
@@ -12,25 +12,21 @@
                 :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-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="11">
-          <el-form-item label="流转方式" prop="supplementAll">
-            <el-select v-model="inputQuery.supplementAll" placeholder="流转方式" clearable size="small"
+          <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-option label="缺量补单" :value="false"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
       </el-row>
-
-
-      <el-row type="flex">
+      <el-row type="flex"  style="margin-bottom: 20px">
         <el-col :span="11">
           <el-form-item label="目标所在仓库" prop="invCode">
             <el-select v-model="inputQuery.invCode" placeholder="目标所在仓库" clearable size="small"
@@ -46,26 +42,26 @@
             </el-select>
           </el-form-item>
         </el-col>
-
-        <el-col :span="11">
-          <el-form-item label="目标往来仓库" prop="defaultInvCode">
-            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"
-                       @change="invChange"
-                       style="width: 90%">
-              <el-option
-                v-for="item in fromInvs"
-                :key="item.name"
-                :label="item.name"
-                :value="item.code">
-                <span style="float: left"> {{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
 
-
-      <el-row>
+      <!--        <el-col :span="11">-->
+      <!--          <el-form-item label="目标往来仓库" prop="defaultInvCode">-->
+      <!--            <el-select v-model="inputQuery.defaultInvCode" placeholder="目标往来仓库" clearable size="small"-->
+      <!--                       @change="invChange"-->
+      <!--                       style="width: 90%">-->
+      <!--              <el-option-->
+      <!--                v-for="item in fromInvs"-->
+      <!--                :key="item.name"-->
+      <!--                :label="item.name"-->
+      <!--                :value="item.code">-->
+      <!--                <span style="float: left"> {{ item.name }}</span>-->
+      <!--              </el-option>-->
+      <!--            </el-select>-->
+      <!--          </el-form-item>-->
+      <!--        </el-col>-->
+      <!--      </el-row>-->
+      <el-divider content-position="left">生成出入库单</el-divider>
+      <el-row style="margin-top: 20px">
         <el-col :span="11">
           <el-form-item label="目标出入库单" prop="action">
             <el-select v-model="inputQuery.action" placeholder="目标出入库单" clearable size="small" style="width: 90%">
@@ -80,7 +76,32 @@
             </el-select>
           </el-form-item>
         </el-col>
-
+        <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-row>
+      <el-row style="margin-bottom: 20px">
+        <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-row>
+      <el-divider content-position="left">生成业务单</el-divider>
+      <el-row>
         <el-col :span="11">
           <el-form-item label="目标业务单" prop="action">
             <el-select v-model="inputQuery.targetBusAction" placeholder="目标业务单" clearable size="small"
@@ -96,25 +117,6 @@
             </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="beforeTime">
             <el-input style="width: 90%"
@@ -128,20 +130,9 @@
           </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-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>
@@ -150,8 +141,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-
-
       <el-row type="flex">
         <el-col :span="23" type="flex">
           <el-form-item prop="intro">