修改销售入库流程跳过

src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -40,10 +40,7 @@
             >
               {{ form.linkPhone }}
             </el-form-item>
-            <el-form-item
-              label="需求类型："
-              style="margin-bottom: 16px"
-            >
+            <el-form-item label="需求类型：" style="margin-bottom: 16px">
               {{ form.sourceTypeName }}
             </el-form-item>
             <!-- <el-form-item
@@ -79,15 +76,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-
-<!--          <el-col :span="12">-->
-<!--            <el-form-item-->
-<!--              label="采购单类型："-->
-<!--              prop="receiveTypeName"-->
-<!--              style="margin-bottom: 16px"-->
-<!--            >-->
-<!--              {{ form.receiveTypeName }}-->
-<!--            </el-form-item>-->
+            <!--          <el-col :span="12">-->
+            <!--            <el-form-item-->
+            <!--              label="采购单类型："-->
+            <!--              prop="receiveTypeName"-->
+            <!--              style="margin-bottom: 16px"-->
+            <!--            >-->
+            <!--              {{ form.receiveTypeName }}-->
+            <!--            </el-form-item>-->
             <el-form-item
               label="车牌号："
               prop="carNo"
@@ -249,7 +245,7 @@
             width: 120,
             prop: 'supplierMark',
             label: '供应商代号',
-            slot: 'supplierMark',
+            slot: 'supplierMark'
           },
           {
             width: 120,
@@ -388,8 +384,8 @@
           });
         }
       },
-      save() {
-        this.$refs.add.handleSave();
+      save(data) {
+        this.$refs.add.handleSave(data);
       },
       success() {
         // console.log(this.$parent,'this.$parent')

src/views/bpm/handleTask/components/purchaseOrder/invoice/submit.vue

@@ -64,7 +64,7 @@
         v-if="
           ['storeManagerApprove'].includes(taskDefinitionKey) &&
           activeComp == 'inoutBound' &&
-          ![1,2].includes(outInData.verifyStatus)
+          ![1, 2].includes(outInData.verifyStatus)
         "
         >申请入库
       </el-button>
@@ -75,7 +75,7 @@
         @click="handleAudit(0)"
         v-if="
           !['starter'].includes(taskDefinitionKey) &&
-          ![1,2].includes(outInData.verifyStatus)
+          ![1, 2].includes(outInData.verifyStatus)
         "
         >驳回
       </el-button>
@@ -126,7 +126,10 @@
   } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
   import { approveTaskWithVariables } from '@/api/bpm/task';
   import { getWarehouseListByIds } from '@/api/bpm/components/saleManage/saleorder';
-  import { getOutInBySourceBizNo,uploadQualityFile } from '@/api/classifyManage';
+  import {
+    getOutInBySourceBizNo,
+    uploadQualityFile
+  } from '@/api/classifyManage';
   import { listAllUserBind } from '@/api/system/organization';
 
   // 流程实例的详情页，可用于审批
@@ -181,7 +184,13 @@
         this.visible = false;
       },
       async storeManagerApprove() {
-        this.$emit('submit');
+        this.$emit('submit', {
+          id: this.taskId,
+          reason: this.form.reason,
+          variables: {
+            pass: true
+          }
+        });
       },
       /** 处理转办审批人 */
       handleUpdateAssignee() {
@@ -227,11 +236,11 @@
         }
         if (this.taskDefinitionKey === 'qualityInspectionFeedback') {
           let arr = await this.getTableValue();
-          console.log(arr,'arr.qualityInspector')
+          console.log(arr, 'arr.qualityInspector');
           if (arr.qualityInspector.qualityFile.length == 0) {
             return this.$message.error('请上传回执附件！');
           }
-          await uploadQualityFile(arr.qualityInspector)
+          await uploadQualityFile(arr.qualityInspector);
         }
         this._approveTaskWithVariables(
           status,

src/views/bpm/handleTask/index.vue

@@ -362,10 +362,9 @@
       });
     },
     methods: {
-      submit() {
-        this.$refs.bziRef.save();
+      submit(data) {
+        this.$refs.bziRef.save(data);
       },
-
       open(data) {
         this.listData = data;
         this.dialogVisible = true;

src/views/bpm/stockManagement/add.vue

@@ -1201,6 +1201,7 @@
 </template>
 
 <script>
+  import { approveTaskWithVariables } from '@/api/bpm/task';
   import { getProductList } from '@/api/bpm/components/saleManage/contact';
   import { getLoginUser } from '@/api/login';
   import picker from './components/picker.vue';
@@ -2015,7 +2016,7 @@
         }
       },
 
-      handleSave() {
+      handleSave(data) {
         this.$refs.formName.validate(async (valid) => {
           if (valid) {
             if (!this.warehousingMaterialList?.length) {
@@ -2071,13 +2072,22 @@
             obj.outInDetailAddPOList = arr;
 
             this.saveLoading = true;
+            // 入库来源storageSource 0-正常  1-外部
+            obj.storageSource = 1;
             try {
               const res = await outin.save(obj);
-              if (res.code == 0) {
-                await outin.outApproves({ outInId: res.data });
-                this.$message.success('保存成功！');
-                this.$emit('success');
-              }
+              // if (res.code == 0) {
+              approveTaskWithVariables(data).then((res) => {
+                console.log(res);
+                if (res.data.code == 0) {
+                  this.$message.success('保存成功！');
+                  this.$emit('success');
+                }
+              });
+              //   await outin.outApproves({ outInId: res.data });
+              //   this.$message.success('保存成功！');
+              //   this.$emit('success');
+              // }
             } catch (error) {
               console.error('保存失败：', error);
             }