基础设置

src/api/system/config.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询参数列表
 export function listConfig(query) {
   return request({
-    url: '/system/config/list',
+    url: '/material/config/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listConfig(query) {
 // 查询参数详细
 export function getConfig(configId) {
   return request({
-    url: '/system/config/' + configId,
+    url: '/material/config/' + configId,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getConfig(configId) {
 // 根据参数键名查询参数值
 export function getConfigKey(configKey) {
   return request({
-    url: '/system/config/configKey/' + configKey,
+    url: '/material/config/configKey/' + configKey,
     method: 'get'
   })
 }
@@ -28,7 +28,7 @@ export function getConfigKey(configKey) {
 // 新增参数配置
 export function addConfig(data) {
   return request({
-    url: '/system/config',
+    url: '/material/config',
     method: 'post',
     data: data
   })
@@ -37,7 +37,7 @@ export function addConfig(data) {
 // 修改参数配置
 export function updateConfig(data) {
   return request({
-    url: '/system/config',
+    url: '/material/config',
     method: 'put',
     data: data
   })
@@ -46,7 +46,7 @@ export function updateConfig(data) {
 // 删除参数配置
 export function delConfig(configId) {
   return request({
-    url: '/system/config/' + configId,
+    url: '/material/config/' + configId,
     method: 'delete'
   })
 }
@@ -54,7 +54,7 @@ export function delConfig(configId) {
 // 刷新参数缓存
 export function refreshCache() {
   return request({
-    url: '/system/config/refreshCache',
+    url: '/material/config/refreshCache',
     method: 'delete'
   })
 }

src/views/claimAndreturn/return/receive/component/handlePage.vue

@@ -151,6 +151,12 @@
                 prop="typeCode"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+              label="退料人员"
+              align="center"
+              prop="backPerson"
+              show-overflow-tooltip
+            />
             <el-table-column
                 label="申请数量"
                 align="center"
@@ -164,7 +170,7 @@
               :show-overflow-tooltip="true"
             />
             <el-table-column
-                label="待退料数量"
+                label="最大退料数量"
                 align="center"
                 :show-overflow-tooltip="true"
             >
@@ -174,7 +180,7 @@
                             (scope.row.partNum =
                                 scope.row.manageType == 0 ||
                                 scope.row.manageType == 1
-                                    ? scope.row.num
+                                    ? scope.row.maxBackNum
                                     : scope.row.partNum)
                         }}
                     </span>
@@ -210,7 +216,7 @@
                         v-if="
                             !isView &&
                             scope.row.manageType == '0' &&
-                            scope.row.num > 0 &&
+                            scope.row.maxBackNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -224,7 +230,7 @@
                             !isView &&
                             (scope.row.manageType == '1' ||
                                 scope.row.manageType == '2') &&
-                            scope.row.num > 0 &&
+                            scope.row.maxBackNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -236,7 +242,7 @@
                         @click="handleBackup(scope.row)"
                         v-if="
                             !isView &&
-                            scope.row.num < scope.row.preNum - scope.row.finishedBackNum &&
+                            scope.row.inCompletedBackNum > 0 &&
                             (userId == scope.row.userId || userId == 1)
                         "
                     >
@@ -542,7 +548,7 @@
                         :show-overflow-tooltip="true"
                     />
                     <el-table-column
-                        label="退料数量"
+                        label="最大退料数量"
                         align="center"
                         prop="backNum"
                         :show-overflow-tooltip="true"
@@ -870,7 +876,7 @@ export default {
                 this.codeQuery.parentId = row.id
                 this.codeQuery.typeId = row.modelId
                 this.dialogIsView = true
-                this.returnNum = Number(row.num)
+                this.returnNum = Number(row.maxBackNum)
                 this.handleCodeQuery()
             } else if (row.manageType == '2') {
                 this.handleNumReturn(row)
@@ -920,7 +926,7 @@ export default {
             this.codeQuery.typeId = row.modelId
             this.codeQuery.agreementId = row.agreementId
             this.dialogIsView = false
-            this.returnNum = Number(row.num)
+            this.returnNum = Number(row.maxBackNum)
             this.handleCodeQuery()
         },
         //数量退料
@@ -928,8 +934,8 @@ export default {
             this.title = '数量退料'
             this.openNum = true
             this.dialogIsView = false
-            this.$set(row, 'backNum', row.num) //退料数量
+            this.$set(row, 'backNum', row.maxBackNum) //退料数量
-            this.returnNum = Number(row.num)
+            this.returnNum = Number(row.maxBackNum)
             this.dialogData.typeMange = row.manageType
             this.dialogData.typeName = row.typeName
             this.dialogData.typeCode = row.typeCode