修改

src/views/warehouseManagement/inboundRequests/components/search.vue

@@ -51,14 +51,14 @@
         </el-form-item>
       </el-col>
 
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
+      <!-- <el-col v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }">
         <el-form-item label="组织机构:">
           <auth-selection
             v-model="where.deptIds"
             style="width: 100%"
           ></auth-selection>
         </el-form-item>
-      </el-col>
+      </el-col> -->
       <el-col
         v-if="activeName == '出入库明细表'"
         v-bind="styleResponsive ? { lg: 6, md: 10 } : { span: 6 }"

src/views/warehouseManagement/inventoryAllocation/details.vue

@@ -35,7 +35,7 @@
               <el-form-item label="调拨类型">
                 <span>{{
                   allocationType.filter((item) => item.code == infoData.type)[0]
-                    .label
+                    ?.label
                 }}</span>
               </el-form-item>
             </el-col>
@@ -254,8 +254,10 @@
     computed: {
       statusList() {
         const base = [{ label: '创建' }];
-        console.log(this.infoData.auditStatus, 'this.infoData.auditStatus');
-        base.push({ code: 1, label: '审核中' });
+        /* 库外 */
+        if (this.infoData.type == 2) {
+          base.push({ code: 1, label: '审核中' });
+        }
         if (this.infoData.auditStatus == 0) {
           base.push({ code: 0, label: '未提交', activeColor: '#cc3300' });
         } else {
@@ -351,13 +353,12 @@
           applyId: this.$route.query.id
         });
         const data = await storageApi.getAllotDetail(this.$route.query.id);
-        console.log(res);
-        console.log(data);
         this.infoData = data;
         this.getDetail(data.flowableTaskId);
         if (this.infoData.type == 1) {
           // 库内调拨
-          this.infoData.auditStatus = 2;
+          /* this.infoData.auditStatus = 2; */
+          this.infoData.auditStatus = data.status;
         } else {
           // 库外调拨
           this.infoData.auditStatus = data.status;

src/views/warehouseManagement/outgoingManagement/index.vue

@@ -79,14 +79,14 @@
                 ></el-option>
               </el-select> </el-form-item
           ></el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="组织机构:" prop="deptIds">
               <auth-selection
                 v-model="formData.deptIds"
                 style="width: 100%"
               ></auth-selection>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="所属工厂" prop="factoryId">
               <el-select

src/views/warehouseManagement/sparePartsOutbound/index.vue

@@ -66,12 +66,12 @@
               value-format="yyyy-MM-dd"
             ></el-date-picker> </el-form-item
         ></el-col> -->
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="组织机构:" prop="deptIds">
               <auth-selection v-model="formData.deptIds" style="width: 100%"></auth-selection>
             </el-form-item>
-          </el-col>
-          <el-col style="display: flex;justify-content: flex-end" :span="18">
+          </el-col> -->
+          <el-col style="display: flex; justify-content: flex-end" :span="18">
             <div>
               <el-button icon="el-icon-refresh-left" size="small" @click="reset"
                 >重置</el-button

src/views/warehouseManagement/statisticalReports/inventoryBalance/components/item-search.vue

@@ -121,14 +121,14 @@
             ></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="组织机构:">
             <auth-selection
               v-model="params.deptIds"
               style="width: 100%"
             ></auth-selection>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="所属工厂" prop="factoryId">
             <el-select

src/views/warehouseManagement/statisticalReports/transceiverSummary/add.vue

@@ -7,7 +7,7 @@
   >
     <el-card shadow="never">
       <!-- 数据表格 -->
-      <div>
+      <div style="padding-bottom: 12px">
         <el-form
           label-position="left"
           class="ele-form-search"
@@ -15,6 +15,7 @@
           :rules="rules"
           @keyup.enter.native="search"
           @submit.native.prevent
+          ref="formData"
         >
           <el-row :gutter="15">
             <el-col :span="5">
@@ -90,8 +91,6 @@
         :needPage="!isView"
         :columns="columns"
         :datasource="datasource"
-        height="calc(100vh - 405px)"
-        full-height="calc(100vh - 116px)"
         tool-class="ele-toolbar-form"
       >
         <!-- 状态 -->
@@ -347,38 +346,39 @@
         return `${obj.year}-${obj.month}-${obj.strDate}`;
       },
       downLoad() {
-        if (!this.formData.name) {
-          return this.$message.error('请输入名称');
-        }
-        if (this.formData.time.length <= 0) {
-          return this.$message.error('请选择时间');
-        }
-        this.loading = true;
-        const params = Object.assign({}, this.formData);
-        if (params.time?.length) {
-          params.startTime = params.time[0];
-          params.endTime = params.time[1];
-        }
-        delete params.time;
-        sendReceiveGatherExcel(params).then((data) => {
-          try {
-            let objectUrl1 = window.URL.createObjectURL(new Blob([data]));
-            let elink = document.createElement('a');
-            elink.setAttribute(
-              'download',
-              decodeURI(decodeURI('收发明细表.xlsx'))
-            );
-            elink.style.display = 'none';
-            elink.href = objectUrl1;
-            document.body.appendChild(elink);
-            elink.click();
-            document.body.removeChild(elink);
-            window.URL.revokeObjectURL(elink.href);
-            this.loading = false;
-            this.visible = false;
-            this.$emit('reload');
-          } catch (err) {
-            this.$message.error('导出失败,请联系管理员!');
+        this.$refs.formData.validate((valid) => {
+          if (valid) {
+            this.loading = true;
+            const params = Object.assign({}, this.formData);
+            if (params.time?.length) {
+              params.startTime = params.time[0];
+              params.endTime = params.time[1];
+            }
+            delete params.time;
+            sendReceiveGatherExcel(params).then((data) => {
+              try {
+                let objectUrl1 = window.URL.createObjectURL(new Blob([data]));
+                let elink = document.createElement('a');
+                elink.setAttribute(
+                  'download',
+                  decodeURI(decodeURI('收发明细表.xlsx'))
+                );
+                elink.style.display = 'none';
+                elink.href = objectUrl1;
+                document.body.appendChild(elink);
+                elink.click();
+                document.body.removeChild(elink);
+                window.URL.revokeObjectURL(elink.href);
+                this.loading = false;
+                this.visible = false;
+                this.$emit('reload');
+              } catch (err) {
+                this.$message.error('导出失败,请联系管理员!');
+              }
+            });
+          } else {
+            console.log('error submit!!');
+            return false;
           }
         });
       },

src/views/warehouseManagement/stockManagement/index.vue

@@ -79,14 +79,14 @@
                 ></el-option>
               </el-select> </el-form-item
           ></el-col>
-          <el-col :span="6">
+          <!-- <el-col :span="6">
             <el-form-item label="组织机构:" prop="deptIds">
               <auth-selection
                 v-model="formData.deptIds"
                 style="width: 100%"
               ></auth-selection>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="6">
             <el-form-item label="所属工厂" prop="factoryId">
               <el-select

src/views/warehouseManagement/stocktaking/plan/components/addInventoryDialog.vue

@@ -585,7 +585,6 @@
       // 封装 - 获取盘点仓库
       async _getWarehouse() {
         const res = await getWarehouseList({});
-        console.log(res);
         this.warehouseList = res.map((item) => {
           return { ...item, name: item.factoryName + '-' + item.name };
         });

src/views/warehouseManagement/stocktaking/work/components/work-search.vue

@@ -61,7 +61,7 @@
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label="盘点部门:">
-          <DeptSelect v-model="where.executeGroupId" @input="nodeClick" />
+          <DeptSelect v-model="where.executeGroupId" />
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
@@ -183,9 +183,10 @@
     },
     created() {
       this.getFactoryList();
+      this.getuserList();
     },
     methods: {
-      async nodeClick(id, data) {
+      /* async nodeClick(id, data) {
         this.where.executeGroupId = id;
         if (data) {
           this.where.executeGroupName = data.name;
@@ -200,6 +201,14 @@
           });
           this.userList = userData.list;
         }
+      }, */
+
+      async getuserList() {
+        let userData = await warehouseDefinition.getUserPage({
+          size: 9999,
+          pageNum: 1
+        });
+        this.userList = userData.list;
       },
       async getTreeData(val) {
         this.where.targetWarehouse = '';

src/views/warehouseManagement/warehouseDefinition/details.vue

@@ -46,7 +46,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="状态:">
-                  <span>{{ warehouseInfo.enabled ? '生效' : '失效' }}</span>
+                  <!--   <span>{{ warehouseInfo.enabled ? '生效' : '失效' }}</span> -->
+                  <span>{{ warehouseInfo.status == 1 ? '生效' : '失效' }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -471,6 +472,7 @@
           this.$route.query.id
         );
         this.warehouseInfo = res.warehouseVO || {};
+        console.log(res, 'res');
         const {
           warehouseAreasSaveList = [],
           areaGoodsshelvesList = [],

src/views/warehouseManagement/warehouseDefinition/index.vue

@@ -75,7 +75,7 @@
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <!-- <el-col :span="5">
             <el-form-item label="组织机构:" prop="deptIds">
               <auth-selection
                 data-type="Array"
@@ -83,8 +83,8 @@
                 style="width: 100%"
               ></auth-selection>
             </el-form-item>
-          </el-col>
-          <el-col :span="3" style="display: flex; justify-content: flex-end">
+          </el-col> -->
+          <el-col :span="8" style="display: flex; justify-content: flex-end">
             <div>
               <el-button icon="el-icon-refresh-left" @click="reset"
                 >重置</el-button