Merge remote-tracking branch 'origin/dev-nx' into dev-nx

sgzb-ui/src/api/claimAndRefund/return.js

@@ -218,6 +218,14 @@ export function getRecord(query) {
     params: query
   })
 }
+// 退料完成之前 判断所有设备是否全部操作退料
+export function endBackBeforeQueryApi(query) {
+  return request({
+    url: 'backReceive/getReceiveViewWebNum',
+    method: 'post',
+    query
+  })
+}
 
 // 退料接收 撤回操作
 export function revoke(data) {

sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue

@@ -913,6 +913,7 @@ export default {
         async completeSetChange(val) {
             const { data: res } = await queryCompleteSetDetailsApi({
                 wholeTypeName: val,
+                companyId: parseInt(this.queryParams.companyId),
             })
 
             // 1 如果模板列表为空 直接赋值

sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue

@@ -693,6 +693,7 @@ import {
     getRecord,
     endBack,
     revoke,
+    endBackBeforeQueryApi,
 } from '@/api/claimAndRefund/return'
 import { getTypeList } from '@/api/store/warehousing'
 import { equipmentTypeTree } from '@/api/store/tools'
@@ -907,24 +908,32 @@ export default {
         },
         //完成退料接收
         async completeBack() {
-            let param1 = {
+            // let param1 = {
+            //     parentId: this.queryParams.id,
+            // }
+            // const res1 = await getRecord(param1)
+            const { data: res } = await endBackBeforeQueryApi({
+                id: this.queryParams.id,
+            })
+
+            if (res == 0) {
+                this.$message.error(
+                    '当前存在未退料机具，请处理之后再点击完成退料！',
+                )
+                return
+            }
+            let param = {
+                createBy: this.createBy,
                 parentId: this.queryParams.id,
+                taskId: this.queryParams.taskId,
             }
-            const res1 = await getRecord(param1)
-            if (res1.code == 200) {
-                let param = {
-                    createBy: this.createBy,
-                    parentId: this.queryParams.id,
-                    taskId: this.queryParams.taskId,
+            endBack(param).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess('操作成功')
+                    // this.back()
+                    this.$emit('goBackPage')
                 }
-                endBack(param).then((response) => {
-                    if (response.code == 200) {
-                        this.$modal.msgSuccess('操作成功')
-                        // this.back()
-                        this.$emit('goBackPage')
-                    }
-                })
-            }
+            })
         },
         //查看数据
         handleViewCode(row) {

sgzb-ui/src/views/warehouseManage/machinery/completeParts/component/addCompleteTools.vue

@@ -13,7 +13,6 @@
             <el-form-item label="成套名称" prop="completeSetName">
                 <el-input
                     placeholder="请输入成套名称"
-                    :disabled="isEdit"
                     v-model="addCompleteForm.completeSetName"
                 />
             </el-form-item>

sgzb-ui/src/views/warehouseManage/machinery/completeTools/component/addCompleteTools.vue

@@ -13,7 +13,6 @@
             <el-form-item label="成套名称" prop="completeSetName">
                 <el-input
                     placeholder="请输入成套名称"
-                    :disabled="isEdit"
                     v-model="addCompleteForm.completeSetName"
                 />
             </el-form-item>