仓库模块修改

src/views/basicData/warehouseMaintenance.vue

@@ -271,18 +271,19 @@ export default {
     remoteMethod(query){
       if (query !== '') {
           this.selectLoading = true;
-          getAllUser({
-            current:1,size:9999,realName:query
+          getUserByRoleAlias({
+            current:1,size:9999,realName:query,
+            roleAlias:'保管员'
           }).then(res =>{
-            this.keepList = res.data.data.records
+            this.keepList = res.data.data
             this.selectLoading = false;
           })
         } else {
           // this.options = [];
-          getAllUser({
-            current:1,size:9999
+          getUserByRoleAlias({
+            current:1,size:9999,roleAlias:'保管员'
           }).then(res =>{
-            this.keepList = res.data.data.records
+            this.keepList = res.data.data
           })
         }
     },
@@ -292,11 +293,12 @@ export default {
         this.checkUser = ''
         this.chooseWare = []
         this.noChooseWare = []
-        getAllUser({
+        getUserByRoleAlias({
           current:1,
-          size:999999
+          size:999999,
+          roleAlias:"保管员"
         }).then(res =>{
-          this.keepList = res.data.data.records
+          this.keepList = res.data.data
         })
       }else{
         this.checkWare = ""
@@ -478,12 +480,12 @@ export default {
         this.getLocation()
       }else if(this.tabPosition == "inventorySetup"){
         this.checkUser = ''
-        getAllUser({
-          // roleAlias:"保管员"
+        getUserByRoleAlias({
+          roleAlias:"保管员",
           current:1,
           size:99999
         }).then(res =>{
-          this.keepList = res.data.data.records
+          this.keepList = res.data.data
         })
       }
     },

src/views/inboundOutboundManagement/otherIssuing/index.vue

@@ -339,6 +339,7 @@ export default {
             // public static final Short BF_TYPE_GLASS_CAKE = 3;
             dicData:[
               { label: "到期维护报废", value: 1 },
+              { label: "未报废", value: 0 },
               { label: "归还报废", value: 2 },
               { label: "玻璃饼报废", value: 3 }
             ],

src/views/inboundOutboundManagement/otherIssuing/otherIssuingDailog.vue

@@ -39,7 +39,7 @@
                         <el-select v-model="stOtherOutRecord.userId" filterable
                             class="item-choose">
                             <el-option v-for="(item, index) in userData" :key="item.id"
-                                :label="item.realName" :value="item.id" />
+                                :label="`${item.realName}(${item.workNo})`" :value="item.id" />
                         </el-select>
                     </el-form-item>
                 </el-col>

src/views/inboundOutboundManagement/returnReceiving.vue

@@ -278,6 +278,20 @@ export default {
               },
             ],
           },
+          {
+            label: "单价",
+            prop: "invadjMoney",
+            span: 24,
+            overflow: true,
+            search: false,
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入单位",
+            //     trigger: "blur",
+            //   },
+            // ],
+          },
           {
             label: "单位",
             prop: "prtum",

src/views/statisticalAnalysis/warehouseAnalysis/inventorySummary.vue

@@ -386,7 +386,7 @@ export default {
                     },
                     {
                         label: '生产标识',
-                        prop: 'inQuantityLevel',
+                        prop: 'quantityLevel',
                         width: 200,
                         search: false,
                         sortable: true,
@@ -489,7 +489,7 @@ export default {
                     },
                     {
                         label: '入库时间',
-                        prop: 'inOutDate',
+                        prop: 'createTime',
                         width: 200,
                         search: true,
                         sortable: true,
@@ -508,18 +508,18 @@ export default {
                             },
                         ],
                     },
-                    {
-                        label: '入库数量',
-                        prop: 'inQuantity',
-                        width: 200,
-                        rules: [
-                            {
-                                required: true,
-                                message: '请输入入库日期',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
+                    // {
+                    //     label: '入库数量',
+                    //     prop: 'inQuantity',
+                    //     width: 200,
+                    //     rules: [
+                    //         {
+                    //             required: true,
+                    //             message: '请输入入库日期',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
                     // {
                     //     label: '入库时间',
                     //     prop: 'inOutDate',
@@ -666,10 +666,10 @@ export default {
             this.loading = true
             let params = {
                 ...this.query,
-                startInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0],
-	            endInOutDate:this.query.inOutDate && this.query.inOutDate.length != 0 && this.query.inOutDate[0]
+                startInOutDate:this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[0],
+	            endInOutDate:this.query.createTime && this.query.createTime.length != 0 && this.query.createTime[1]
             }
-            const {inOutDate,...invalideParams} = params
+            const {createTime,...invalideParams} = params
             getList({
                 current:this.page.currentPage,
                 size:this.page.pageSize,

src/views/warehouseManagement/materialMaintenance.vue

@@ -528,6 +528,9 @@ export default {
                 res.data.data.records.forEach(item =>{
                     item.minWarning = item.minWarning == 1 ? true : false
                 })
+                // res.data.data.records.map(item =>{
+                //     item.gcId =  item.gcId == 0 ? null :item.gcId
+                // })
                 this.data = res.data.data.records
                 this.page.total = res.data.data.total;
             })