文件夹调整

src/views/bpm/handleTask/components/saleOrder/addDialog.vue → src/views/bpm/handleTask/components/quotation/addDialog.vue

@@ -251,7 +251,7 @@
     getTableList,
     getcontactlink,
     getDetail
-  } from '@/api/bpm/components/saleManage/saleorder';
+  } from '@/api/bpm/components/saleManage/quotation';
   import { copyObj } from '@/utils/util';
 
   export default {
@@ -539,3 +539,4 @@
     padding-right: 30px;
   }
 </style>
+@/api/bpm/components/saleManage/quotation

src/views/bpm/handleTask/components/saleOrder/detailDialog.vue → src/views/bpm/handleTask/components/quotation/detailDialog.vue

@@ -198,7 +198,7 @@
   import { copyObj } from '@/utils/util';
   import inventoryTable from './inventoryTable.vue';
 
-  import { getDetail } from '@/api/bpm/components/saleManage/saleorder';
+  import { getDetail } from '@/api/bpm/components/saleManage/quotation';
   export default {
     mixins: [dictMixins],
     props: {
@@ -403,3 +403,4 @@
     }
   }
 </style>
+@/api/bpm/components/saleManage/quotation

src/views/bpm/handleTask/components/saleOrder/inventoryTable.vue → src/views/bpm/handleTask/components/quotation/inventoryTable.vue

@@ -172,11 +172,11 @@
       <template v-slot:measuringUnit="scope">
         <el-form-item
           style="margin-bottom: 20px"
-          :prop="'datasource.' + scope.$index + '.measuringUnit'"
+          :prop="'datasource.' + scope.$index + '.measuringUnit'" 
         >
           <el-input
             :disabled="taskDefinitionKey == 'technicianApprove'"
-            v-model="scope.row.measuringUnit"
+            v-model="scope.row.measuringUnit" disabled
             placeholder="请输入"
           ></el-input>
         </el-form-item>

src/views/bpm/handleTask/components/saleOrder/submit.vue → src/views/bpm/handleTask/components/quotation/submit.vue

@@ -42,16 +42,23 @@
         @click="handleAudit(1)"
         >通过
       </el-button>
+      <el-button
+        icon="el-icon-edit-outline"
+        type="success"
+        size="mini"
+        v-if="taskDefinitionKey === 'productionSupervisorApprove1'"
+        @click="handleAudit(1, 'zp')"
+        >指派技术员
+      </el-button>
       <el-button
         icon="el-icon-circle-close"
         type="danger"
         size="mini"
         @click="handleAudit(0)"
-        v-if="
+        v-if="!
           [
-            'productionSupervisorApprove2',
-            'salesManagerApprove',
-            'salesmanApprove'
+            'productionSupervisorApprove1',
+            'technicianApprove',
           ].includes(taskDefinitionKey)
         "
         >驳回
@@ -92,7 +99,7 @@
     UpdateInformation,
     salesManagerApprove,
     salesmanApprove
-  } from '@/api/bpm/components/saleManage/saleorder';
+  } from '@/api/bpm/components/saleManage/quotation';
   import { approveTask, delegateTask } from '@/api/bpm/task';
   import { listAllUserBind } from '@/api/system/organization';
 
@@ -144,21 +151,25 @@
         this.$emit('handleBackList');
       },
 
-      async handleAudit(status) {
+      async handleAudit(status, type) {
         //生产主管审批选择技术员
         if (this.taskDefinitionKey === 'productionSupervisorApprove1') {
-          if (!this.form.technicianId) {
+          if (!this.form.technicianId && type == 'zp') {
             this.$message.warning(`请选择技术人员！`);
             return;
           }
+          if (type == 'zp') {
+            await assignTechnician({
+              businessId: this.businessId,
+              id: this.taskId,
+              reason: this.form.reason,
+              technicianId: this.form.technicianId
+            });
+          }else{
+            await this.salesmanApproveHttp(status);
+          }
 
-          await assignTechnician({
-            businessId: this.businessId,
-            id: this.taskId,
-            reason: this.form.reason,
-            technicianId: this.form.technicianId
-          });
-          this.$emit('handleAudit', {status});
+          this.$emit('handleAudit', { status });
         }
         //技术员修改
         if (this.taskDefinitionKey === 'technicianApprove') {
@@ -175,7 +186,7 @@
             try {
               await updateTech(arr);
               await this._approveTask();
-              this.$emit('handleAudit', {status});
+              this.$emit('handleAudit', { status });
             } catch (error) {}
           });
         }
@@ -187,14 +198,17 @@
               reason: this.form.reason,
               status
             });
-            this.$emit('handleAudit', {status,title: status === 0 ? '驳回' : ''});
+            this.$emit('handleAudit', {
+              status,
+              title: status === 0 ? '驳回' : ''
+            });
           } catch (error) {}
         }
         //销售员补充
         if (this.taskDefinitionKey === 'salesmanApprove') {
           if (status === 0) {
             await this.salesmanApproveHttp(status);
-            this.$emit('handleAudit',{status,title: '驳回'});
+            this.$emit('handleAudit', { status, title: '驳回' });
             return;
           }
           this.$emit('getTableValue', async (data) => {
@@ -203,7 +217,7 @@
               try {
                 await UpdateInformation(arr);
                 await this.salesmanApproveHttp(status);
-                this.$emit('handleAudit', {status});
+                this.$emit('handleAudit', { status });
               } catch (error) {}
             }
           });
@@ -217,7 +231,10 @@
               reason: this.form.reason,
               status
             });
-            this.$emit('handleAudit', {status,title: status === 0 ? '驳回' : ''});
+            this.$emit('handleAudit', {
+              status,
+              title: status === 0 ? '驳回' : ''
+            });
           } catch (error) {}
         }
       },
@@ -236,3 +253,4 @@
 </script>
 
 <style lang="scss"></style>
+@/api/bpm/components/saleManage/quotation