前端sdy

src/views/taskManagement/moveWarehouseTask.vue

@@ -166,9 +166,6 @@
             >
               查看
             </div>
-            <!-- <ws-button class="completed" @click="see(scope.row)">
-              查看
-            </ws-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -390,13 +387,13 @@ export default {
     handleCloe() {
       this.dialogViewSpareMoney = false
     },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
+    // history(row) {
+    //   billoperatehis({ id: row.id })
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.historyList = response
+    //     })
+    // },
 
   },
 }

src/views/taskManagement/tranManagementTransport.vue

@@ -101,7 +101,7 @@
         <el-table-column prop="end" class="table_td" label="终点">
           <template slot-scope="scope">
             {{ scope.row.endPrivate }}{{ scope.row.endCity
-            }}{{ scope.row.endArea }}{{ scope.row.endDetailedAddress }}
+            }}{{ scope.row.endArea }}{{ scope.row.endDetailedAddress }}{{scope.row.receiveWarehouse}}
           </template>
         </el-table-column>
 

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -937,6 +937,9 @@ export default {
           return
         }
       }
+      if(this.endflag){
+
+      
       this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -1027,6 +1030,98 @@ export default {
         .catch(() => {
           return false
         })
+      }else{
+        this.$confirm(`您还未选择最终阶段，是否确定提交？？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              this.deptBudgetList.compId =
+                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.tranType = this.checkList.toString()
+              this.deptBudgetList.startPrivate =
+                CodeToText[this.selectedOptions[0]]
+              this.deptBudgetList.startCity =
+                CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.startArea =
+                CodeToText[this.selectedOptions[2]]
+              this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+                CodeToText[this.selectedOptions[0]]
+              this.deptBudgetList.tranProcessInfoList[0].sendCity =
+                CodeToText[this.selectedOptions[1]]
+              this.deptBudgetList.tranProcessInfoList[0].sendArea =
+                CodeToText[this.selectedOptions[2]]
+              if (this.endflag) {
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receiveCity = CodeToText[this.selectedOptions1[1]]
+                this.deptBudgetList.tranProcessInfoList[
+                  this.deptBudgetList.tranProcessInfoList.length - 1
+                ].receiveArea = CodeToText[this.selectedOptions1[2]]
+              }
+
+              for (
+                var i = 0;
+                i < this.deptBudgetList.tranProcessInfoList.length;
+                i++
+              ) {
+                this.deptBudgetList.tranProcessInfoList[i].sort = i
+              }
+
+              addtrantask(this.deptBudgetList)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('添加成功')
+                  this.deptBudgetList = {
+                    taskNo: '',
+                    totalStorage: 0,
+                    goodsName: '玉米',
+                    goodsNameKey: 1,
+                    warehouseType: '1',
+                    tranProcessInfoList: [
+                      {
+                        processNo: '',
+                        tranType: '汽运',
+                        deliveryDateStart: '',
+                        deliveryDateEnd: '',
+                        weight: '',
+                        selectedOptions: [],
+                        selectedOptions1: [],
+                        sendPrivate: '',
+                        sendCity: '',
+                        sendArea: '',
+                        receivePrivate: '',
+                        receiveCity: '',
+                        receiveArea: '',
+                        sendDetailedAddress: '',
+                        receiveDetailedAddress: '',
+                        sender: '',
+                        receiver: '',
+                        senderPhone: '',
+                        receiverPhone: '',
+                        contractNo: '',
+                        receiveWarehouse: '',
+                      },
+                    ],
+                  }
+                  this.$router.push({ path: 'tranManagementTransport' })
+                })
+            } else {
+              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+      }
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()