排产管理增加上装配置信息删除功能、流程中获取上一环节和获取下一环节接口增加参数业务businessSid

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@@ -104,9 +104,10 @@
                 <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
               </template>
             </el-table-column>
-            <el-table-column label="上装信息" header-align="center" width="100" align="center">
+            <el-table-column label="上装信息" header-align="center" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleUpdate(scope.row.busVehicleApplySz, scope.$index)">编辑</el-button>
+                <el-button type="primary" v-show="scope.row.busVehicleApplySz !== null && scope.row.busVehicleApplySz !== undefined" size="mini" @click="handleUpdate(scope.row.busVehicleApplySz, scope.$index)">编辑</el-button>
+                <el-button type="danger" v-show="scope.row.busVehicleApplySz !== null && scope.row.busVehicleApplySz !== undefined" size="mini" @click="handleDel(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column label="上装销售指导价" align="center" width="200">
@@ -377,6 +378,7 @@ export default {
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.vehicleFunction = val.vehicleTypeValue
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.costPrice = ''
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.guidePrice = ''
+      this.formobj.busVehicleApplyDetailList[index].guidePrice = ''
     },
     handleUpdate(row, index) {
       if (row !== null && row !== undefined) {
@@ -386,6 +388,10 @@ export default {
         this.$message({ showClose: true, type: 'success', message: '请先选择上装信息' })
       }
     },
+    handleDel(index) {
+      this.formobj.busVehicleApplyDetailList[index].guidePrice = ''
+      this.$delete(this.formobj.busVehicleApplyDetailList[index], 'busVehicleApplySz')
+    },
     backPeizhiAdd(value, index) {
       this.viewState = 1
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz = value

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@@ -234,7 +234,7 @@ export default {
       this.operation = val
       this.currentLink = true
       this.dialogList.comment = '同意'
-      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]
@@ -248,7 +248,7 @@ export default {
       this.operation = val
       this.currentLink = true
       this.dialogList.comment = ''
-      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey }).then((resp) => {
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
         if (resp.success) {
           var arr = resp.data
           this.nextNode = arr[0]

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@@ -103,9 +103,10 @@
                 <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
               </template>
             </el-table-column>
-            <el-table-column label="上装信息" header-align="center" width="100" align="center">
+            <el-table-column label="上装信息" header-align="center" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="handleUpdate(scope.row.busVehicleApplySz, scope.$index)">编辑</el-button>
+                <el-button type="primary" size="mini" v-show="scope.row.busVehicleApplySz !== null && scope.row.busVehicleApplySz !== undefined" @click="handleUpdate(scope.row.busVehicleApplySz, scope.$index)">编辑</el-button>
+                <el-button type="danger" size="mini" v-show="scope.row.busVehicleApplySz !== null && scope.row.busVehicleApplySz !== undefined" @click="handleDel(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
             <el-table-column label="上装销售指导价" align="center" width="200">
@@ -371,6 +372,7 @@ export default {
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.vehicleFunction = val.vehicleTypeValue
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.costPrice = ''
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz.guidePrice = ''
+      this.formobj.busVehicleApplyDetailList[index].guidePrice = ''
     },
     handleUpdate(row, index) {
       if (row !== null && row !== undefined) {
@@ -380,6 +382,10 @@ export default {
         this.$message({ showClose: true, type: 'success', message: '请先选择上装信息' })
       }
     },
+    handleDel(index) {
+      this.formobj.busVehicleApplyDetailList[index].guidePrice = ''
+      this.$delete(this.formobj.busVehicleApplyDetailList[index], 'busVehicleApplySz')
+    },
     backPeizhiAdd(value, index) {
       this.viewState = 1
       this.formobj.busVehicleApplyDetailList[index].busVehicleApplySz = value