From d79154583ffea4a1f3a4c96adbe082768be9c074 Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Thu, 28 Jul 2022 11:29:07 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9,=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=81=94=E5=8A=A8=E6=8E=A7=E5=88=B6=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=AF=E5=90=A6=E5=8F=AF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/BasicEntrutsRece.vue          | 581 +++++++++---------
 src/views/basic/BussinessTypeLocl.vue         |   2 +-
 src/views/basic/BussinessTypeThird.vue        |   1 +
 src/views/basic/invWarehouse.vue              |   9 +-
 src/views/thrsys/ThrInvWarehouse.vue          |   5 +-
 .../userManage/param/phoneRegisterManage.vue  |   6 +-
 6 files changed, 316 insertions(+), 288 deletions(-)

diff --git a/src/views/basic/BasicEntrutsRece.vue b/src/views/basic/BasicEntrutsRece.vue
index 0c3f976..81eff79 100644
--- a/src/views/basic/BasicEntrutsRece.vue
+++ b/src/views/basic/BasicEntrutsRece.vue
@@ -1,314 +1,329 @@
 <template>
-    <div>
-        <el-card>
-            <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
-                <el-form-item class="query-form-item">
-                    <el-input
-                        v-model="filterQuery.name"
-                        style="width: 250px"
-                        placeholder="单据类型名称"
-                    ></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button-group style="margin-left: 10px;display:flex;">
-                        <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-                        <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                        <el-button type="primary" icon="search" @click="handleAddClick"
-                        >新增
-                        </el-button
-                        >
-                    </el-button-group>
+  <div>
+    <el-card>
+      <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
+        <el-form-item class="query-form-item">
+          <el-input
+              v-model="filterQuery.name"
+              style="width: 250px"
+              placeholder="单据类型名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button-group style="margin-left: 10px;display:flex;">
+            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+            <el-button type="primary" icon="search" @click="getList">查询</el-button>
+            <el-button type="primary" icon="search" @click="handleAddClick"
+                       :disabled="!configParms.entrustAction"
+            >新增
+            </el-button
+            >
+          </el-button-group>
 
-                </el-form-item>
-            </el-form>
+        </el-form-item>
+      </el-form>
 
-            <el-table v-loading="loading" :data="list" style="width: 100%">
-                <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
-                <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
-                <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
-                <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
-                <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
-                <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
-                <el-table-column label="委托验收人" prop="employeeName" fixed>
-                </el-table-column>
-                <el-table-column label="操作" fixed="right">
-                    <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleModifyClick(scope.row)"
-                        >编辑
-                        </el-button
-                        >
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="deleteDialog(scope.row)"
-                        >删除
-                        </el-button
-                        >
-                    </template>
+      <el-table v-loading="loading" :data="list" style="width: 100%">
+        <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
+        <el-table-column label="扫码单据类型" prop="curName" fixed></el-table-column>
+        <el-table-column label="当前仓库" prop="curInvName" fixed></el-table-column>
+        <el-table-column label="当前分库" prop="invWarehouseName" fixed></el-table-column>
+        <el-table-column label="委托验收仓库" prop="entrustInvName" fixed></el-table-column>
+        <el-table-column label="委托验收分库" prop="entrustSubInvName" fixed></el-table-column>
+        <el-table-column label="委托验收人" prop="employeeName" fixed>
+        </el-table-column>
+        <el-table-column label="操作" fixed="right">
+          <template slot-scope="scope">
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="handleModifyClick(scope.row)"
+                :disabled="!configParms.entrustAction"
+            >编辑
+            </el-button
+            >
+            <el-button
+                type="text"
+                size="small"
+                @click.native.stop="deleteDialog(scope.row)"
+                :disabled="!configParms.entrustAction"
+            >删除
+            </el-button
+            >
+          </template>
 
-                </el-table-column>
-            </el-table>
+        </el-table-column>
+      </el-table>
 
-            <el-dialog
-                title="新增委托验收"
-                :visible.sync="addDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="addDialogVisible"
-            >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
+      <el-dialog
+          title="新增委托验收"
+          :visible.sync="addDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="addDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onAddSubmit"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
 
-            <el-dialog
-                title="编辑委托验收"
-                :visible.sync="modifyDialogVisible"
-                width="70%"
-                :close-on-click-modal="false"
-                :close-on-press-escape="false"
-                v-if="modifyDialogVisible"
-            >
-                <modifyDialog :inputQuery="inputQuery"></modifyDialog>
-                <div style="text-align: center">
-                    <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
-                    >提交
-                    </el-button
-                    >
-                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"
-                    >取消
-                    </el-button
-                    >
-                </div>
-            </el-dialog>
-            <el-pagination
-                :page-size="filterQuery.limit"
-                @current-change="handleCurrentChange"
-                layout="prev, pager, next"
-                :total="total"
-            ></el-pagination>
-        </el-card>
-    </div>
+      <el-dialog
+          title="编辑委托验收"
+          :visible.sync="modifyDialogVisible"
+          width="70%"
+          :close-on-click-modal="false"
+          :close-on-press-escape="false"
+          v-if="modifyDialogVisible"
+      >
+        <modifyDialog :inputQuery="inputQuery"></modifyDialog>
+        <div style="text-align: center">
+          <el-button type="primary" size="small" icon="search" @click="onModifySubmit"
+          >提交
+          </el-button
+          >
+          <el-button type="primary" size="small" icon="search" @click="cancelDialog"
+          >取消
+          </el-button
+          >
+        </div>
+      </el-dialog>
+      <el-pagination
+          :page-size="filterQuery.limit"
+          @current-change="handleCurrentChange"
+          layout="prev, pager, next"
+          :total="total"
+      ></el-pagination>
+    </el-card>
+  </div>
 </template>
 <script>
 import {
-    getEntrustRece,
-    deleteEntrustRece,
-    updateEntrustRece,
-    insertEntrustRece,
+  getEntrustRece,
+  deleteEntrustRece,
+  updateEntrustRece,
+  insertEntrustRece,
 } from "../../api/basic/EntrustRece";
 
 import modifyDialog from "./BasicEntrutsReceModify";
+import {findConfig} from "@/api/thrsys/spsSyncStatus";
 
 export default {
-    data() {
-        return {
-            filterQuery: {
-                name: "",
-                page: 1,
-                limit: 20,
-            },
-            loading: false,
-            addDialogVisible: false,
-            modifyDialogVisible: false,
-            list: [],
-            inputQuery: {
-                action: "",
-                name: "",
-                entrustInv: "",
-                entrustUser: "",
-                entrustAction: null,
-                finishRece: false,
-                curInv: "",
-                entrustSubInv: "",
-                invWarehouseCode: "",
-            },
-            enableMap: {
-                true: "是",
-                false: "否",
-            },
-            mainActionMap: {
-                WareHouseIn: "入库",
-                WareHouseOut: "出库"
-            },
-            fileList: [],
-            total: 0,
-            multipleSelection: [],
-            uploadFileUrl: null,
-            headers: {},
+  data() {
+    return {
+      filterQuery: {
+        name: "",
+        page: 1,
+        limit: 20,
+      },
+      loading: false,
+      addDialogVisible: false,
+      modifyDialogVisible: false,
+      list: [],
+      inputQuery: {
+        action: "",
+        name: "",
+        entrustInv: "",
+        entrustUser: "",
+        entrustAction: null,
+        finishRece: false,
+        curInv: "",
+        entrustSubInv: "",
+        invWarehouseCode: "",
+      },
+      enableMap: {
+        true: "是",
+        false: "否",
+      },
+      mainActionMap: {
+        WareHouseIn: "入库",
+        WareHouseOut: "出库"
+      },
+      fileList: [],
+      total: 0,
+      multipleSelection: [],
+      uploadFileUrl: null,
+      headers: {},
+      configParms: {},
 
-        };
-    },
+    };
+  },
 
-    methods: {
-        onReset() {
-            this.$router.push({
-                path: "",
-            });
-            this.filterQuery = {
-                name: "",
-                page: 1,
-                limit: 20,
-            };
-            this.getList();
-        },
-        cancelDialog() {
-            this.modifyDialogVisible = false;
-            this.addDialogVisible = false;
-        },
-        handleCurrentChange(val) {
-            this.filterQuery.page = val;
-            this.getList();
-        },
-        getList() {
-            this.loading = true;
-            getEntrustRece(this.filterQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.list = response.data.list || [];
-                    this.total = response.data.total || 0;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        name: "",
+        page: 1,
+        limit: 20,
+      };
+      this.getList();
+    },
+    cancelDialog() {
+      this.modifyDialogVisible = false;
+      this.addDialogVisible = false;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      getEntrustRece(this.filterQuery)
+          .then((response) => {
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+    },
 
 
-        onAddSubmit() {
+    onAddSubmit() {
 
-            if (this.$isBlank(this.inputQuery.action)) {
-                this.$message.error("单据类型不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.curInv)) {
-                this.$message.error("请输入委托仓库！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.entrustInv)) {
-                this.$message.error("请输入接受委托仓库！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.entrustUser)) {
-                this.$message.error("请输入接受委托人！");
-                return;
-            }
+      if (this.$isBlank(this.inputQuery.action)) {
+        this.$message.error("单据类型不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.curInv)) {
+        this.$message.error("请输入委托仓库！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustInv)) {
+        this.$message.error("请输入接受委托仓库！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustUser)) {
+        this.$message.error("请输入接受委托人！");
+        return;
+      }
 
-            if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
-                this.$message.error("当前分库不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.entrustSubInv)) {
-                this.$message.error("请输入接受委托分库！");
-                return;
-            }
+      if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+        this.$message.error("当前分库不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+        this.$message.error("请输入接受委托分库！");
+        return;
+      }
 
-            insertEntrustRece(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+      insertEntrustRece(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        onModifySubmit() {
-            if (this.$isBlank(this.inputQuery.action)) {
-                this.$message.error("单据类型不能为空！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.curInv)) {
-                this.$message.error("请输入委托仓库！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.entrustInv)) {
-                this.$message.error("请输入接受委托仓库！");
-                return;
-            }
-            if (this.$isBlank(this.inputQuery.entrustInv)) {
-                this.$message.error("请输入接受委托人！");
-                return;
-            }
-            insertEntrustRece(this.inputQuery)
-                .then((response) => {
-                    this.loading = false;
-                    this.cancelDialog();
-                    this.getList();
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.cancelDialog();
-                });
-        },
+    onModifySubmit() {
+      if (this.$isBlank(this.inputQuery.action)) {
+        this.$message.error("单据类型不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.curInv)) {
+        this.$message.error("请输入委托仓库！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustInv)) {
+        this.$message.error("请输入接受委托仓库！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustInv)) {
+        this.$message.error("请输入接受委托人！");
+        return;
+      }
+      insertEntrustRece(this.inputQuery)
+          .then((response) => {
+            this.loading = false;
+            this.cancelDialog();
+            this.getList();
+          })
+          .catch(() => {
+            this.loading = false;
+            this.cancelDialog();
+          });
+    },
 
-        handleAddClick() {
-            this.inputQuery = {enable: true, expireTip: true};
-            this.addDialogVisible = true;
-        },
+    handleAddClick() {
+      this.inputQuery = {enable: true, expireTip: true};
+      this.addDialogVisible = true;
+    },
 
-        handleModifyClick(row) {
-            this.inputQuery = row;
-            this.modifyDialogVisible = true;
-        },
+    handleModifyClick(row) {
+      this.inputQuery = row;
+      this.modifyDialogVisible = true;
+    },
 
-        deleteDialog(rowId) {
-            this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            })
-                .then(() => {
-                    this.deleteOrders(rowId);
-                })
-                .catch(() => {
-                });
-        },
+    deleteDialog(rowId) {
+      this.$confirm("此操作将永久删除该委托验收信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+          .then(() => {
+            this.deleteOrders(rowId);
+          })
+          .catch(() => {
+          });
+    },
 
-        deleteOrders(data) {
-            this.loading = true;
-            let tquery = {
-                id: data.id + "",
-            };
-            deleteEntrustRece(tquery)
-                .then((response) => {
-                    this.getList();
-                    if (response.code == 20000) {
-                        this.$message({
-                            type: "success",
-                            message: "删除成功！",
-                        });
-                    } else {
-                        this.$message.error(response.message);
-                    }
+    deleteOrders(data) {
+      this.loading = true;
+      let tquery = {
+        id: data.id + "",
+      };
+      deleteEntrustRece(tquery)
+          .then((response) => {
+            this.getList();
+            if (response.code == 20000) {
+              this.$message({
+                type: "success",
+                message: "删除成功！",
+              });
+            } else {
+              this.$message.error(response.message);
+            }
 
-                })
-                .catch(() => {
-                });
-        },
-    },
-    components: {
-        modifyDialog,
+          })
+          .catch(() => {
+          });
     },
-    mounted() {
-    },
-    created() {
-        this.getList();
+    getSyncConfig() {
+      findConfig()
+          .then((response) => {
+            if (response.code == 20000) {
+              this.configParms = response.data;
+            }
+          })
+          .catch(() => {
+          });
     },
+  },
+  components: {
+    modifyDialog,
+  },
+  mounted() {
+  },
+  created() {
+    this.getList();
+  },
 };
 </script>
diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue
index 600452a..0f8790b 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -66,7 +66,7 @@
                         >
                         <el-button
                             type="text"
-                            size="small"
+                            size="small" :disabled="!configParms.typeBus"
                             @click.native.stop="deleteDialog(scope.row)"
                         >删除
                         </el-button
diff --git a/src/views/basic/BussinessTypeThird.vue b/src/views/basic/BussinessTypeThird.vue
index d533f0f..c3b53e0 100644
--- a/src/views/basic/BussinessTypeThird.vue
+++ b/src/views/basic/BussinessTypeThird.vue
@@ -35,6 +35,7 @@
                         >
                         <el-button type="primary" icon="search" @click="updateDownload"
                                    v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"
+                                   :disabled="!configParms.typeThird"
                         >更新下载
                         </el-button>
                     </el-button-group>
diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue
index 4cda1dd..1092726 100644
--- a/src/views/basic/invWarehouse.vue
+++ b/src/views/basic/invWarehouse.vue
@@ -102,14 +102,14 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="scope.row.pid!=0"
+                            :disabled="scope.row.pid!=0  || !configParms.basicInv"
                             @click.native.stop="handleSubForm(scope.row, 'add')"
                         >添加分库
                         </el-button
                         >
                         <el-button
                             type="text"
-                            size="small"
+                            size="small" :disabled="!configParms.basicInv"
                             @click.native.stop="handleForm( scope.row, 'edit')"
                         >编辑
                         </el-button
@@ -160,6 +160,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicInv"
                             @click.native.stop="addUser(scope.row)"
                         >添加用户
                         </el-button
@@ -167,6 +168,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicInv"
                             @click.native.stop="addBussinessType(scope.row)"
                         >添加单据类型
                         </el-button
@@ -174,6 +176,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicInv"
                             @click.native.stop="handleSubForm( scope.row, 'edit')"
                         >编辑
                         </el-button
@@ -230,6 +233,7 @@
                             <el-button
                                 type="text"
                                 size="small"
+                                !configParms.basicInv
                                 @click.native="delWarehouseUser(scope.row.id)">
                                 移除
                             </el-button>
@@ -267,6 +271,7 @@
                             <el-button
                                 type="text"
                                 size="small"
+                                !configParms.basicInv
                                 @click.native="delWarehouseBussinessType(scope.row.id)">
                                 移除
                             </el-button>
diff --git a/src/views/thrsys/ThrInvWarehouse.vue b/src/views/thrsys/ThrInvWarehouse.vue
index 07dd79f..b7a76a7 100644
--- a/src/views/thrsys/ThrInvWarehouse.vue
+++ b/src/views/thrsys/ThrInvWarehouse.vue
@@ -38,6 +38,7 @@
                         </el-button>
                         <el-button type="primary" @click.native="downloadWarehouse()"
                                    v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.fromType==3"
+                                   :disabled="!configParms.basicThirdInv"
                         >下载仓库
                         </el-button>
                     </el-button-group>
@@ -81,6 +82,7 @@
                             type="text"
                             size="small"
                             @click.native.stop="handleSubForm( scope.row, 'add')"
+                            :disabled="!configParms.basicThirdInv"
                         >添加分库
                         </el-button
                         >
@@ -135,6 +137,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="!configParms.basicThirdInv"
                             @click.native.stop="handleSubForm( scope.row, 'edit')"
                         >编辑
                         </el-button
@@ -142,7 +145,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            :disabled="!configParms.basicInv"
+                            :disabled="!configParms.basicThirdInv"
                             @click.native.stop="handleSubDel(scope.row)"
                         >删除
                         </el-button
diff --git a/src/views/userManage/param/phoneRegisterManage.vue b/src/views/userManage/param/phoneRegisterManage.vue
index 8aa4b43..b28132c 100644
--- a/src/views/userManage/param/phoneRegisterManage.vue
+++ b/src/views/userManage/param/phoneRegisterManage.vue
@@ -272,7 +272,10 @@ export default {
                 });
         },
         editDialog(row) {
-            this.checkQuery = row;
+
+            this.checkQuery = JSON.parse(JSON.stringify(row));
+
+            // this.checkQuery = row;
             this.editDialogVisible = true;
         },
         cancelDialog() {
@@ -299,6 +302,7 @@ export default {
                             type: "success",
                             message: "更新成功！",
                         });
+                        this.editDialogVisible = false;
                     } else {
                         this.$message.warning("更新失败");
                         this.loading = false;