库存产品修改

.env.production

@@ -7,9 +7,9 @@ ENV = 'production'
 
 #林纪裕
 # VUE_APP_BASE_API = 'http://101.43.77.55:9150/UDI_SPMS_SERVER/'
-VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 吴总测试服务器
-# VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/'
 
 # 平潭
 # VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/'
@@ -23,6 +23,9 @@ VUE_APP_BASE_API =  'http://r.jiyuudims.cloud:5004/UDI_SPMS_SERVER/'
 # 实施测试服务器 wqq
 # VUE_APP_BASE_API = 'http://192.168.0.66:9160/UDI_SPMS_SERVER/'
 
+# 平潭内网
+# VUE_APP_BASE_API = 'http://10.200.200.253:9160/UDI_SPMS_SERVER/'
+
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'

src/views/inout/IoSupSearchOrder.vue

@@ -3,7 +3,7 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="单号:">
               <el-input v-model="filterQuery.billNo" placeholder="单号"
                         style="width: 90%"
@@ -25,7 +25,7 @@
           <!--              </el-select>-->
           <!--            </el-form-item>-->
           <!--          </el-col>-->
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item class="query-form-item" label="收货仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"
                          style="width: 90%"

src/views/inventory/InvPreInProductsDetail.vue

@@ -58,7 +58,7 @@
         </el-button-group>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="list" style="width: 100%">
+    <el-table v-loading="loading" :data="list" style="width: 100%" border>
       <el-table-column label="序号" type="index"></el-table-column>
       <el-table-column
         label="UDI码"

src/views/inventory/InvPreProductsDetail.vue

@@ -40,7 +40,7 @@
       </el-descriptions-item>
     </el-descriptions>
 
-    <el-form :inline="true" :model="invPreProductDetailQuery" style="margin-top: 10px;" size="mini">
+    <el-form :inline="true" :model="invPreProductDetailQuery" style="margin-top: 10px;" size="mini" border>
       <el-form-item class="query-form-item" label="UDI码:">
         <el-input v-model="invPreProductDetailQuery.code"
                   placeholder="请输入UDI码查询"

src/views/inventory/InvSupPreInProducts.vue

@@ -73,6 +73,34 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6">
+            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -158,7 +186,7 @@ import {getInvListByUser} from "@/api/system/invWarehouse";
 import {getInvPreInProduct, deleteInvPreInProduct} from "@/api/inventory/invPreInSearch";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
-import invPreProductsDetail from "@/views/inventory/InvPreProductsDetail.vue";
+import invPreProductsDetail from "@/views/inventory/InvPreInProductsDetail.vue";
 
 export default {
   name: "InvPreProducts",
@@ -173,7 +201,7 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,
         page: 1,
         limit: 10,
       },
@@ -217,9 +245,9 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
         page: 1,
         limit: 10,
+        invCode: null,
       };
       this.getList();
     },

src/views/inventory/InvSupPreProducts.vue

@@ -73,6 +73,33 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+          <el-col :span="6" >
+            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
+              <el-select
+                v-model="filterQuery.supId"
+                filterable
+                remote
+                clearable="true"
+                reserve-keyword
+                placeholder="请选择供应商名称"
+                :remote-method="findMethod"
+                size="mini"
+                :loading="corpLoading"
+                @change="corpChange"
+                style="width: 90%"
+              >
+                <el-option
+                  v-for="item in fromOptions"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.erpId"
+                >
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="top-right-btn">
@@ -217,7 +244,7 @@ export default {
         supId: null,
         zczbhhzbapzbh: null,
         ylqxzcrbarmc: null,
-        invCode: this.$store.getters.locInvCode,
+        invCode: null,
         page: 1,
         limit: 10,
       };
@@ -246,7 +273,7 @@ export default {
 
     getList() {
       this.loading = true;
-      this.filterQuery.supId = this.$store.getters.customerId;
+      // this.filterQuery.supId = this.$store.getters.customerId;
       getInvPreProduct(this.filterQuery).then((res) => {
         this.loading = false;
         if (res.code === 20000) {

src/views/inventory/InvSupProuducts.vue

@@ -74,7 +74,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item class="query-form-item" label="供应商名称:">
+            <el-form-item class="query-form-item" label="供应商名称:" v-if="showSup">
               <el-select
                 v-model="filterQuery.supId"
                 filterable

src/views/sync/SysUdimsData.vue

@@ -21,7 +21,7 @@
 
           <el-form-item class="query-form-item">
             <el-date-picker v-model="syncTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
+                            value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
             </el-date-picker>
           </el-form-item>
 
@@ -33,7 +33,7 @@
               </el-button>
               <!--               :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck"-->
               <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
-                v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
+                         v-if="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
                 同步单据类型
               </el-button>
               <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="!configParms.basicProducts&& !configParms.basicCorp&&
@@ -41,7 +41,7 @@
                                 && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
               </el-button>
               <el-button type="primary" icon="search" @click="createScheduleDialog(4)"
-                v-if="configParms.dbDiProducts==2">同步国家库DI数据
+                         v-if="configParms.dbDiProducts==2">同步国家库DI数据
               </el-button>
             </el-button-group>
           </el-form-item>
@@ -79,12 +79,12 @@
         <el-table-column label="操作" fixed="right" width="160">
           <template slot-scope="scope">
             <el-popconfirm @confirm="downFile(scope.row)" confirm-button-text='下载' cancel-button-text='不用了' class="mr10"
-              icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
+                           icon="el-icon-info" icon-color="blck" title="是否确认要下载文件？" v-if="scope.row.cacheFilePath">
               <el-button type="text" size="small" slot="reference">下载
               </el-button>
             </el-popconfirm>
             <el-popconfirm @confirm="deleteData(scope.row.id)" confirm-button-text='删除' cancel-button-text='不用了'
-              icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
+                           icon="el-icon-info" icon-color="red" title="是否确认要删除这条数据？">
               <el-button type="text" size="small" slot="reference">删除
               </el-button>
             </el-popconfirm>
@@ -92,11 +92,11 @@
         </el-table-column>
       </el-table>
       <el-pagination :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next"
-        :total="total" :current-page="filterQuery.page"></el-pagination>
+                     :total="total" :current-page="filterQuery.page"></el-pagination>
     </el-card>
 
     <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
-      :visible.sync="syncVisible">
+               :visible.sync="syncVisible">
       <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
     </el-dialog>
 
@@ -104,346 +104,346 @@
 </template>
 
 <script>
-  import {
+import {
-    filterLog,
+  filterLog,
-    deleteLog,
+  deleteLog,
-    createSchedule,
+  createSchedule,
-    findConfig,
+  findConfig,
-    updateConfig,
+  updateConfig,
-    infoByStatus
+  infoByStatus
-  } from "../../api/sync/spsSyncStatus";
+} from "../../api/sync/spsSyncStatus";
-  import store from "@/store";
+import store from "@/store";
-
+
-  export default {
+export default {
-    data() {
+  data() {
-      return {
+    return {
-        filterQuery: {
+      filterQuery: {
-          id: null,
+        id: null,
-          status: "1",
+        status: "1",
-          page: 1,
+        page: 1,
-          limit: 10,
+        limit: 10,
-          syncTime: null,
-        },
-        list: [],
-        headers: {},
-        detailList: [],
-        thirdSys: [],
-        thirdSysDetail: null,
-        total: 0,
-        currentRow: null,
-        editQuery: null,
-        type: {
-          "AutoDownloadOrder": "扫码单据",
-          "AutoDownloadBusType": "单据类型",
-          "AutoDownloadAllData": "基础信息",
-          "AutoDownloadDiProducts": "国家库DI数据"
-        },
-        status: {
-          1: "任务待触发",
-          2: "文件待生成",
-          3: "文件待同步",
-          4: "任务完成",
-        },
-
-        wmsstatus: {
-          "1": "处理成功",
-          "": "未处理",
-          null: "未处理",
-        },
-
-
-        configQuery: {
-          id: null,
-          typeBus: null,
-          typeScan: null,
-          typeThird: null,
-          basicProducts: null,
-          basicCorp: null,
-          basicInv: null,
-          basicThirdProducts: null,
-          basicThirdCorp: null,
-          basicThirdInv: null,
-          basicThirdBusOrder: null,
-          orderScanFinish: null,
-          dbDiProducts: null,
-          downstreamEnable: null,
-
-        },
-        uploadFileUrl: null,
-        uploadData: {
-          thirdSys: "thirdId",
-        },
-        templateDlUrl: null,
-        checked: false,
         syncTime: null,
-        configParms: {},
-        syncInfo: null,
-        syncVisible: false
-      };
-    },
-
-    methods: {
-      onReset() {
-        this.$router.push({
-          path: "",
-        });
-        this.filterQuery = {
-          id: null,
-          status: null,
-          page: 1,
-          limit: 20,
-
-        };
-        this.syncTime = null;
-        this.getList();
       },
-      getList() {
+      list: [],
-        this.loading = true;
+      headers: {},
-        this.filterQuery.syncTime = this.syncTime;
+      detailList: [],
-        filterLog(this.filterQuery)
+      thirdSys: [],
-          .then((response) => {
+      thirdSysDetail: null,
-            this.loading = false;
+      total: 0,
-            if (response.code == 20000) {
+      currentRow: null,
-              this.list = response.data.list || [];
+      editQuery: null,
-              this.total = response.data.total || 0;
+      type: {
-            } else {
+        "AutoDownloadOrder": "扫码单据",
-              this.$message.error(response.message);
+        "AutoDownloadBusType": "单据类型",
-            }
+        "AutoDownloadAllData": "基础信息",
-          })
+        "AutoDownloadDiProducts": "国家库DI数据"
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
       },
-
+      status: {
-      getConfig() {
+        1: "任务待触发",
-        findConfig()
+        2: "文件待生成",
-          .then((response) => {
+        3: "文件待同步",
-            if (response.code == 20000) {
+        4: "任务完成",
-              this.configQuery = response.data;
-            } else {
-              this.$message.error(response.message);
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
       },
-      saveConfig() {
+
-
+      wmsstatus: {
-        updateConfig(this.configQuery)
+        "1": "处理成功",
-          .then((response) => {
+        "": "未处理",
-            this.loading = false;
+        null: "未处理",
-            if (response.code == 20000) {
-              this.$message.success("更新成功！");
-              this.getConfig();
-            }
-          })
-          .catch(() => {
-            this.loading = false;
-          });
       },
 
 
-      cancelDialog(val) {
+      configQuery: {
-        this.udiImportDetailVisible = false;
+        id: null,
-        this.thrCorpSelectVisible = false;
+        typeBus: null,
-        if (val) {
+        typeScan: null,
-          this.getList();
+        typeThird: null,
-        }
+        basicProducts: null,
+        basicCorp: null,
+        basicInv: null,
+        basicThirdProducts: null,
+        basicThirdCorp: null,
+        basicThirdInv: null,
+        basicThirdBusOrder: null,
+        orderScanFinish: null,
+        dbDiProducts: null,
+        downstreamEnable: null,
+
       },
-      handleCurrentChange(val) {
+      uploadFileUrl: null,
-        this.filterQuery.page = val;
+      uploadData: {
-        this.getList();
+        thirdSys: "thirdId",
       },
+      templateDlUrl: null,
+      checked: false,
+      syncTime: null,
+      configParms: {},
+      syncInfo: null,
+      syncVisible: false
+    };
+  },
+
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        id: null,
+        status: null,
+        page: 1,
+        limit: 20,
 
-      createScheduleDialog(type) {
+      };
-        if (this.$isNotBlank(this.syncTime)) {
+      this.syncTime = null;
-          this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
+      this.getList();
-              confirmButtonText: "确定",
+    },
-              cancelButtonText: "取消",
+    getList() {
-              type: "warning",
+      this.loading = true;
-            })
+      this.filterQuery.syncTime = this.syncTime;
-            .then(() => {
+      filterLog(this.filterQuery)
-              this.createSchedule(type);
+        .then((response) => {
-            })
+          this.loading = false;
-            .catch(() => {});
+          if (response.code == 20000) {
-        } else {
+            this.list = response.data.list || [];
-          this.createSchedule(type);
+            this.total = response.data.total || 0;
-        }
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
 
-      },
+    getConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configQuery = response.data;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    saveConfig() {
+
+      updateConfig(this.configQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code == 20000) {
+            this.$message.success("更新成功！");
+            this.getConfig();
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
 
-      createSchedule(type) {
-        let query = {
-          createType: type,
-          syncTime: this.syncTime,
-        }
 
-        createSchedule(query)
+    cancelDialog(val) {
-          .then((response) => {
+      this.udiImportDetailVisible = false;
-            this.loading = false;
+      this.thrCorpSelectVisible = false;
-            if (response.code == 20000) {
+      if (val) {
-              this.$message.success("创建成功！");
+        this.getList();
-            } else if (response.code == 501) {
+      }
-
+    },
-              this.$alert(response.message, '提示', {
+    handleCurrentChange(val) {
-                confirmButtonText: '确定',
+      this.filterQuery.page = val;
-                type: "warning",
+      this.getList();
-                callback: action => {}
+    },
-              });
+
-
+    createScheduleDialog(type) {
-            } else {
+      if (this.$isNotBlank(this.syncTime)) {
-              this.$message.error(response.message);
+        this.$confirm("此操作将从" + this.syncTime + "开始同步最新数据，是否继续", "提示", {
-            }
+          confirmButtonText: "确定",
-            this.getList();
+          cancelButtonText: "取消",
-          })
+          type: "warning",
-          .catch(() => {
+        })
-            this.loading = false;
-          });
-      },
-      deleteDialog(rowId) {
-        this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          })
           .then(() => {
-            let dQuery = {
+            this.createSchedule(type);
-              id: rowId,
-            };
-            deleteLog(dQuery)
-              .then((response) => {
-                this.loading = false;
-                if (response.code == 20000) {
-                  this.$message.success("删除成功");
-                } else {
-                  this.$message.error(response.message);
-                }
-                this.getList();
-              })
-              .catch(() => {
-                this.loading = false;
-              });
           })
           .catch(() => {});
-      },
+      } else {
-      handleChange(response, files, fileList) {
+        this.createSchedule(type);
-        if (response.code != 20000) {
+      }
-          this.$message.error(response.message);
-          this.getList();
-        } else {
-          this.$message.success(response.data);
-          this.getList();
-        }
-      },
-      statusFilterType(status) {
-        const statusMap = {
-          0: "warning",
-          1: "success",
-          2: "danger",
-        };
-        return statusMap[status];
-      },
-      wmsFilterType(status) {
-        const statusMap = {
-          "未处理": "warning",
-          "处理成功": "success",
-        };
-        return statusMap[status];
-      },
 
+    },
 
-      getSyncConfig() {
+    createSchedule(type) {
-        findConfig()
+      let query = {
-          .then((response) => {
+        createType: type,
-            if (response.code == 20000) {
+        syncTime: this.syncTime,
-              this.configParms = response.data;
+      }
-            }
+
-          })
+      createSchedule(query)
-          .catch(() => {});
+        .then((response) => {
-      },
+          this.loading = false;
-      detailDialog(id) {
+          if (response.code == 20000) {
-        this.syncVisible = true;
+            this.$message.success("创建成功！");
-        this.list.forEach(item => {
+          } else if (response.code == 501) {
-          if (id === item.id) {
+
-            this.syncInfo = item.remark;
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: "warning",
+              callback: action => {}
+            });
+
+          } else {
+            this.$message.error(response.message);
           }
+          this.getList();
         })
-      },
+        .catch(() => {
-      downFile(rows) {
+          this.loading = false;
-        infoByStatus({
+        });
-          'id': rows.id
+    },
-        }).then(res => {
+    deleteDialog(rowId) {
-          let blob = new Blob([res])
+      this.$confirm("此操作将删除该任务信息, 是否继续?", "提示", {
-          let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
+        confirmButtonText: "确定",
-          let link = document.createElement("a")
+        cancelButtonText: "取消",
-          link.href = window.URL.createObjectURL(blob)
+        type: "warning",
-          link.download = fileName
+      })
-          link.style.display = 'none'
+        .then(() => {
-          document.body.appendChild(link)
+          let dQuery = {
-          link.click()
+            id: rowId,
-          window.URL.revokeObjectURL(link.href)
+          };
-          document.body.removeChild(link)
+          deleteLog(dQuery)
+            .then((response) => {
+              this.loading = false;
+              if (response.code == 20000) {
+                this.$message.success("删除成功");
+              } else {
+                this.$message.error(response.message);
+              }
+              this.getList();
+            })
+            .catch(() => {
+              this.loading = false;
+            });
         })
-      },
+        .catch(() => {});
-      deleteData(id) {
+    },
-        deleteLog({id}).then((response) => {
+    handleChange(response, files, fileList) {
-            if (response.code == 20000) {
+      if (response.code != 20000) {
-              this.filterQuery.page = 1
+        this.$message.error(response.message);
-              this.$message.success("删除成功");
+        this.getList();
-            } else {
+      } else {
-              this.$message.error(response.message);
+        this.$message.success(response.data);
-            }
+        this.getList();
-            this.getList();
-          })
-          .catch(() => {});
       }
     },
-
+    statusFilterType(status) {
-    mounted() {},
+      const statusMap = {
-    components: {},
+        0: "warning",
-    created() {
+        1: "success",
-      this.headers = {
+        2: "danger",
-        ADMIN_ID: store.getters.adminId,
-        ADMIN_TOKEN: store.getters.token,
       };
-      this.getSyncConfig();
+      return statusMap[status];
-      this.getList();
-      this.getConfig();
     },
-  };
+    wmsFilterType(status) {
+      const statusMap = {
+        "未处理": "warning",
+        "处理成功": "success",
+      };
+      return statusMap[status];
+    },
+
+
+    getSyncConfig() {
+      findConfig()
+        .then((response) => {
+          if (response.code == 20000) {
+            this.configParms = response.data;
+          }
+        })
+        .catch(() => {});
+    },
+    detailDialog(id) {
+      this.syncVisible = true;
+      this.list.forEach(item => {
+        if (id === item.id) {
+          this.syncInfo = item.remark;
+        }
+      })
+    },
+    downFile(rows) {
+      infoByStatus({
+        'id': rows.id
+      }).then(res => {
+        let blob = new Blob([res])
+        let fileName = rows.cacheFilePath.substring(rows.cacheFilePath.lastIndexOf('/'))
+        let link = document.createElement("a")
+        link.href = window.URL.createObjectURL(blob)
+        link.download = fileName
+        link.style.display = 'none'
+        document.body.appendChild(link)
+        link.click()
+        window.URL.revokeObjectURL(link.href)
+        document.body.removeChild(link)
+      })
+    },
+    deleteData(id) {
+      deleteLog({id}).then((response) => {
+        if (response.code == 20000) {
+          this.filterQuery.page = 1
+          this.$message.success("删除成功");
+        } else {
+          this.$message.error(response.message);
+        }
+        this.getList();
+      })
+        .catch(() => {});
+    }
+  },
+
+  mounted() {},
+  components: {},
+  created() {
+    this.headers = {
+      ADMIN_ID: store.getters.adminId,
+      ADMIN_TOKEN: store.getters.token,
+    };
+    this.getSyncConfig();
+    this.getList();
+    this.getConfig();
+  },
+};
 </script>
 <style>
-  .itemTag {
+.itemTag {
-    float: left;
+  float: left;
-    text-align: left;
+  text-align: left;
-    margin-top: 10px;
+  margin-top: 10px;
-    width: 100px;
+  width: 100px;
-  }
+}
-
+
-  .text {
+.text {
-    font-size: 13px;
+  font-size: 13px;
-    font-family: "Microsoft YaHei";
+  font-family: "Microsoft YaHei";
-  }
+}
-
+
-  .el-row {
+.el-row {
-    display: flex;
+  display: flex;
-    flex-wrap: wrap;
+  flex-wrap: wrap;
-
+
-  }
+}
-
+
-  .el-col {
+.el-col {
-    border-radius: 4px;
+  border-radius: 4px;
-    flex-wrap: wrap;
+  flex-wrap: wrap;
-  }
+}
-
+
-  .syncInfo {
+.syncInfo {
-    font-size: medium;
+  font-size: medium;
-    font-family: "Microsoft YaHei";
+  font-family: "Microsoft YaHei";
-    line-height: 25px;
+  line-height: 25px;
-  }
+}
 </style>

src/views/system/dept/authDept.vue

@@ -30,10 +30,11 @@
           <el-form-item>
             <el-button-group>
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"
-                >重置</el-button
+              >重置
+              </el-button
               >
               <el-button type="primary" @click="onSubmit" icon="el-icon-search"
-                >查询
+              >查询
               </el-button>
               <!--              <el-button type="primary" @click="addDeptDialog"-->
               <!--                         icon="el-icon-plus"-->
@@ -44,7 +45,7 @@
                 type="primary"
                 icon="el-icon-sort"
                 @click="toggleExpandAll"
-                >展开/折叠
+              >展开/折叠
               </el-button>
             </el-button-group>
           </el-form-item>
@@ -71,29 +72,29 @@
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="scope.row.status | statusFilterType"
-              >{{ scope.row.status | statusFilterName }}
+            >{{ scope.row.status | statusFilterName }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remark"> </el-table-column>
+        <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button
               type="text"
               :disabled="scope.row.status == 0"
               @click.native="subAddDeptDialog(scope.row)"
-              >新增
+            >新增
             </el-button>
 
             <el-button type="text" @click.native="updateDeptDialog(scope.row)"
-              >编辑
+            >编辑
             </el-button>
 
             <el-button
               type="text"
               :disabled="scope.row.id === 1"
               @click.native.stop="deleteDialog(scope.row)"
-              >删除
+            >删除
             </el-button>
           </template>
         </el-table-column>
@@ -124,7 +125,7 @@
             <el-form-item label="部门名称:" prop="name">
               <el-input
                 v-model="formData.name"
-                style="width: 90%"
+                style="width: 80%"
                 clearable
                 size="small"
               ></el-input>
@@ -183,7 +184,7 @@
 
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" size="small" @click.native="formSubmit()"
-            >提交
+          >提交
           </el-button>
           <el-button @click.native="cancelDialog" size="small">取消</el-button>
         </div>
@@ -213,13 +214,13 @@
                 type="primary"
                 icon="el-icon-refresh"
                 @click="onUserReset"
-                >重置
+              >重置
               </el-button>
               <el-button
                 type="primary"
                 @click="onUserSubmit"
                 icon="el-icon-search"
-                >查询
+              >查询
               </el-button>
               <el-tooltip
                 content="请移步至权限管理-用户管理-编辑界面选择所属部门信息"
@@ -244,13 +245,13 @@
             prop="employeeName"
           ></el-table-column>
           <el-table-column label="用户账号" prop="userName"></el-table-column>
-          <el-table-column label="备注" prop="comments"> </el-table-column>
+          <el-table-column label="备注" prop="comments"></el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <el-button
                 type="text"
                 @click.native.stop="removeUserDialog(scope.row)"
-                >移除
+              >移除
               </el-button>
             </template>
           </el-table-column>
@@ -287,13 +288,13 @@
                 type="primary"
                 icon="el-icon-refresh"
                 @click="onInvReset"
-                >重置
+              >重置
               </el-button>
               <el-button
                 type="primary"
                 @click="onInvSubmit"
                 icon="el-icon-search"
-                >查询
+              >查询
               </el-button>
               <el-tooltip
                 content="请移步至系统管理-组织管理-仓库信息管理界面绑定仓库信息"
@@ -315,7 +316,7 @@
           <el-table-column label="序号" type="index"></el-table-column>
           <el-table-column label="仓库名称" prop="name"></el-table-column>
           <el-table-column label="仓库编码" prop="code"></el-table-column>
-          <el-table-column label="备注" prop="remark"> </el-table-column>
+          <el-table-column label="备注" prop="remark"></el-table-column>
           <!--          <el-table-column label="操作">-->
           <!--            <template slot-scope="scope">-->
           <!--              <el-button-->
@@ -347,11 +348,11 @@ import {
   saveWarehouse,
 } from "@/api/system/invWarehouse";
 
-import { treeList, treeSelectedList } from "@/api/system/dataStatus";
+import {treeList, treeSelectedList} from "@/api/system/dataStatus";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { listDeptUser, removeUser } from "@/api/system/deptUser";
+import {listDeptUser, removeUser} from "@/api/system/deptUser";
-import { filterSubAll } from "@/api/system/invSubWarehouse";
+import {filterSubAll} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -382,9 +383,9 @@ export default {
       deptOptions: [],
       rules: {
         name: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" },
+          {required: true, message: "部门名称不能为空", trigger: "blur"},
         ],
-        status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
+        status: [{required: true, message: "状态不能为空", trigger: "blur"}],
       },
       menuExpand: false,
       menuNodeAll: false,
@@ -628,7 +629,8 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
     toggleExpandAll() {
       this.refreshTable = false;
@@ -666,7 +668,7 @@ export default {
       });
     },
     getDeptStatusMenuTreeselect(deptId) {
-      let query = { deptId: deptId };
+      let query = {deptId: deptId};
       return treeSelectedList(query).then((response) => {
         this.menuOptions = response.data.menus;
         return response;
@@ -749,7 +751,8 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => {
+        });
     },
 
     //仓库相关
@@ -770,8 +773,9 @@ export default {
       this.getInvList();
     },
   },
-  components: { Treeselect },
+  components: {Treeselect},
-  mounted() {},
+  mounted() {
+  },
   created() {
     this.getList();
   },

src/views/system/dept/invWarehouse.vue

@@ -432,8 +432,8 @@ export default {
       total: 0,
       advanceTypeTypeMap: {
         1: "入账库",
-        2: "寄售库",
+        3: "寄售库",
-        3: "预验收库",
+        2: "预验收库",
       },
       formMap: {
         add: "仓库信息-新增",