退料联调代码提交

src/api/back/index.js

@@ -78,6 +78,15 @@ export function editBackApply(data) {
   })
 }
 
+// 退料提交
+export function submitBackApply(data) {
+  return request({
+    url: '/material/back_apply_info/submitBackApply',
+    method: 'post',
+    data: data,
+  })
+}
+
 
 //新增编辑-编码类型-获取所有编码
 export function getMachineById(query) {

src/views/material/back/component/addReturn.vue

@@ -345,10 +345,7 @@
     </div>
 </template>
 
-<script>
-  import {
-    equipmentTypeTree, 
-} from '@/api/purchase/goodsArrived';
+<script> 
 import {
     getProjectList,
     getUnitList,
@@ -358,20 +355,7 @@ import {
     getBackApplyInfo,
     editBackApply,
     getMachineById
-} from '@/api/back/index.js'
-
-// import {
-//     getProData,
-//     getUnitData,
-//     getDeviceTypeTree,
-//     getAgreementInfoById,
-//     submitLeaseApply,
-//     getUseTypeTreee,
-//     getUseNumByTypeId,
-// } from '@/api/claimAndRefund/receive' 
-// import { 
-//     materialReturnNoteByApply, 
-// } from '@/api/claimAndRefund/return.js'
+} from '@/api/back/index.js' 
 import { mapState } from 'vuex'
 import { getInfo, h } from '@/api/login'
 import { getToken } from '@/utils/auth'
@@ -386,15 +370,7 @@ export default {
             type: [String, Number],
         }
     },
-    data() {
-        const validatePhone = (rule, value, callback) => {
-            const reg = /^[1][3-9][0-9]{9}$/
-            if (!reg.test(value)) {
-                this.queryParams.phone = ''
-            } else {
-                callback()
-            }
-        }
+    data() { 
         return {
             // 遮罩层
             loading: false,
@@ -504,10 +480,6 @@ export default {
                         trigger: 'blur',
                     },
                 ],
-                // phone: [
-                //   { validator: validatePhone, trigger: "blur"},
-                //   {required: true, message: '请输入正确的手机号', trigger: 'change'},
-                // ],
             },
             unitList: [], //单位 集合
             proList: [], // 工程 集合

src/views/material/back/component/home.vue

@@ -111,8 +111,7 @@
                 <el-button
                 type="warning"
                 plain
-                size="mini"
-                @click="handleSubmit" 
+                size="mini" 
                 >提交</el-button
                 >
             </el-col>
@@ -257,17 +256,28 @@
                     >
                     <el-button
                         size="mini"
-                        type="warning"
+                        type="primary"
                         plain
                         icon="el-icon-edit"
+                        v-if="scope.row.taskStatus!=2"
                         @click="handleUpdate(scope.row)" 
                         >编辑</el-button
                     >
+                    <el-button
+                        size="mini"
+                        type="success"
+                        plain
+                        icon="el-icon-edit"
+                        v-if="scope.row.taskStatus!=2"
+                        @click="handleSubmit(scope.row)" 
+                        >提交</el-button
+                    >
                      
                     <el-button
                         size="mini"
                         type="danger"
                         icon="el-icon-delete"
+                        v-if="scope.row.taskStatus!=2&&scope.row.taskStatus!=1"
                         @click="handleDelete(scope.row)"
                         >删除</el-button
                     >
@@ -351,8 +361,8 @@ import {
     getBackApplyList,
     getProjectList,
     getUnitList,
-    backApplyRemove
-  
+    backApplyRemove,
+    submitBackApply
 } from '@/api/back/index.js'
 // import { getInfo, h } from '@/api/login'
 // import {
@@ -540,16 +550,30 @@ export default {
             this.title = '查看'
             this.isShowOneFlag = true
         },
-        // 提交
-        handleSubmit() {
-            this.title = '确认操作'
-            this.openTextOne = '确认提交退料么?'
-            this.openTextTwo = '确认提交退料么?'
-            this.openOne = true
-        },
-        submitOpenOneForm() {
-            this.openTextThree = '提交成功！'
-            this.openTwo = true
+        // // 提交
+        // handleSubmit() {
+        //     this.title = '确认操作'
+        //     this.openTextOne = '确认提交退料么?'
+        //     this.openTextTwo = '确认提交退料么?'
+        //     this.openOne = true
+        // },
+        // submitOpenOneForm() {
+        //     this.openTextThree = '提交成功！'
+        //     this.openTwo = true
+        // },
+         
+        handleSubmit(row){
+            this.$modal.confirm('是否确认提交所选择的退料任务？') .then(() => {
+                    let param = {
+                        id:row.id,
+                        taskId:row.taskId
+                    }
+                    submitBackApply(param).then((res) => {
+                        this.getList() 
+                        this.$message.success('操作成功!')
+                    }) 
+                }).catch(() => { 
+                })
         },
         /** 删除按钮操作 */
         handleDelete(row) {
@@ -557,7 +581,7 @@ export default {
             //     id:row.id+ '',
             // }
             this.$modal
-                .confirm('是否确认删除所选择的数据项？')
+                .confirm('是否确认删除所选择的退料任务？')
                 .then(() => {
                     return backApplyRemove(row.id)
                 })
@@ -575,9 +599,11 @@ export default {
          /** 导出按钮操作 */
          handleExport() {
             this.download(
-                'material/backApply/export',
+                'material/back_apply_info/export',
                 {
                     ...this.queryParams,
+                    startTime:this.queryParams.time[0],
+                    endTime:this.queryParams.time[1]
                 },
                 `退料申请单_${new Date().getTime()}.xlsx`,
             )