退料接收修改2

sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue

@@ -94,7 +94,7 @@
               <el-table-column
                 label="预领数量"
                 align="center"
-                prop="partNum"
+                prop="num"
                 :show-overflow-tooltip="true"
               />
             </el-table>
@@ -103,7 +103,7 @@
       </el-table-column>
       <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
       <el-table-column label="申请数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
-      <el-table-column label="退料数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
+      <el-table-column label="退料数量" align="center" prop="num" :show-overflow-tooltip="true" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
         <template slot-scope="scope">
           <el-button
@@ -120,19 +120,19 @@
             size="mini"
             type="primary"
             @click="handleCodeReturn(scope.row)"
-            v-if="!isView&&scope.row.manageType=='0'&&scope.row.partNum>0"
+            v-if="!isView&&scope.row.manageType=='0'&&scope.row.num>0"
           >编码退料</el-button>
           <el-button
             size="mini"
             type="primary"
             @click="handleNumReturn(scope.row)"
-            v-if="!isView&&(scope.row.manageType=='1'||'2')&&scope.row.partNum>0"
+            v-if="!isView&&(scope.row.manageType=='1'||'2')&&scope.row.num>0"
           >数量退料</el-button>
           <el-button
             size="mini"
             icon="el-icon-zoom-in"
             @click="handleBackup(scope.row)"
-            v-if="!isView&&scope.row.partNum<scope.row.preNum"
+            v-if="!isView&&scope.row.num<scope.row.preNum"
           >撤回</el-button>
         </template>
       </el-table-column>
@@ -612,7 +612,7 @@ export default {
         this.codeQuery.parentId = row.id
         this.codeQuery.typeId = row.modelId
         this.dialogIsView = true
-        this.returnNum = Number(row.partNum)
+        this.returnNum = Number(row.num)
         this.handleCodeQuery()
       } else if (row.manageType == '2') {
         this.handleNumReturn(row)
@@ -656,7 +656,7 @@ export default {
       this.codeQuery.taskId = row.taskId
       this.codeQuery.typeId = row.modelId
       this.dialogIsView = false
-      this.returnNum = Number(row.partNum)
+      this.returnNum = Number(row.num)
       this.handleCodeQuery()
     },
     //数量退料
@@ -664,8 +664,8 @@ export default {
       this.title = '数量退料'
       this.openNum = true
       this.dialogIsView = false
-      this.$set(row, 'backNum', row.partNum) //退料数量
-      this.returnNum = Number(row.partNum)
+      this.$set(row, 'backNum', row.num) //退料数量
+      this.returnNum = Number(row.num)
       this.dialogData.typeMange = row.manageType
       this.dialogData.typeName = row.typeName
       this.dialogData.typeCode = row.typeCode
@@ -751,7 +751,7 @@ export default {
       let arr = []
       for (const item of data) {
         let sumUnmber = (item.qualifiedNum || 0) + (item.serviceNum || 0) + (item.scrapNum || 0)
-        if (sumUnmber > item.partNum) {
+        if (sumUnmber > item.partNum&&sumUnmber > item.num) {
           this.$modal.msgError('退料总量已大于待退料数量！')
           return
         } else {