Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -41,6 +41,7 @@
             >出货库：{{ shipment1.sendWarehouse }}</span
           >
           <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ shipment1.taskStatus }}</span>
+           <span class="status2" v-show="shipment1.taskStatus == '执行中'">{{ shipment1.taskStatus }}</span>
           <span class="status1" v-show="shipment1.taskStatus == '已完成'">{{ shipment1.taskStatus }}</span>
         </div>
         <!--出库经办人-->
@@ -70,7 +71,8 @@
           <span style="margin-left: 14px">
             入货库：{{ enter.warehouseName }}</span
           >
-          <span class="status" v-show="shipment1.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
+          <span class="status" v-show="enter.taskStatus == '待审核'">{{ enter.taskStatus }}</span>
+            <span class="status2" v-show="enter.taskStatus == '执行中'">{{ enter.taskStatus }}</span>
           <span class="status1" v-show="enter.taskStatus  == '已完成'">{{ enter.taskStatus  }}</span>
         </div>
         <!--入库经办人-->
@@ -173,7 +175,7 @@
              {{this.enter.stockReturnCount}}
             </template> 
              <template scope="scope">
-              {{scope.row.weight}}<span style="margin: 0 30px">至</span>{{scope.row.warehouseName}}
+              {{scope.row.weight}}<span style="margin: 0 30px;color: #8890B1;">退至</span>{{scope.row.warehouseName}}
               <div></div>
             </template> 
           </el-table-column>
@@ -646,9 +648,14 @@ export default {
 }
 .flow,
 .flow1 {
-  border-radius: 4px;
+  border-radius: 5px;
   border: 1px solid #d8dce6;
   margin-top: 20px;
+  // border-bottom: 0px;
+  border-top: 0px;
+}
+.flow{
+  height: 95px;
 }
 /deep/.flow .el-form-item {
   display: inline-grid;
@@ -699,4 +706,11 @@ background: #E5F1F7;
   border-radius: 3px;
   color: #50CAD4;
 }
+.status2{
+   margin-left: 10px;
+background: #E1E7FD;
+  padding: 2px 5px;
+  border-radius: 3px;
+  color: #5473E8;
+}
 </style>

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -367,6 +367,7 @@ export default {
         warehouseType: '1',
         tranProcessInfoList: [
           {
+            sort:0,
             processNo: '',
             tranType: '汽运',
             tranTypeKey: '1',
@@ -785,6 +786,11 @@ export default {
 
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
           this.deptBudgetList.tranType = this.checkList.toString()
+          for(var i = 0 ; i < this.deptBudgetList.tranProcessInfoList.length ; i++){
+            this.deptBudgetList.tranProcessInfoList[i].sort = i
+
+          }
+          console.log(this.deptBudgetList.tranProcessInfoList,"数组111")
           addtrantask(this.deptBudgetList)
             .toPromise()
             .then(response => {

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -915,4 +915,7 @@ export default {
   height: 73vh;
   overflow: scroll;
 }
+.el-cascader{
+  width: 100%;
+}
 </style>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -95,34 +95,16 @@
                <el-divider direction="vertical" class="line"></el-divider>
               <!--电话-->
               <ws-form-item label="电话：" span="1" prop="driverPhone">
-                <!-- <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.driverPhone"
-                maxlength="20"
-                size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
               </ws-form-item>
                <el-divider direction="vertical" class="line"></el-divider>
               <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo">
-                <!-- <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.carNo"
-                maxlength="20"
-                size="small"
-                />-->
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
                <el-divider direction="vertical" class="line"></el-divider>
               <!--装车净重-->
               <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
-                <!-- <ws-input
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车(吨)"
-                maxlength="20"
-                size="small"
-                />-->
                 {{item.loadNetWeight}}
               </ws-form-item>
                <el-divider direction="vertical" class="line"></el-divider>
@@ -160,12 +142,6 @@
                     alt=""
                   />
                 </el-upload>
-                <!-- <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未上传'" class="signStatus">
-                  {{ item.signStatus }}
-                </div>
-                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已上传'" class="signStatus1">
-                  {{ item.signStatus }}
-                </div> -->
               </template>
             </ws-form-item>
             </ws-info-table>

src/views/tranManagement/tranManagementShipping.vue

@@ -45,7 +45,6 @@
           type="input"
           class="findValue"
         ></ws-input>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img
             width="16"
@@ -144,7 +143,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="接单日期" prop="createDate">
+        <el-table-column class="table_td" label="接单时间" prop="createDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -558,7 +558,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then(response => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -141,9 +141,7 @@
                   :value="item.staffName"
                 />
               </el-select>
-              <!-- <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span>  -->
             </ws-form-item>
-             <el-divider direction="vertical" class="line"></el-divider>
             <!--电话-->
             <ws-form-item label="司机电话：" span="1" prop="driverPhone">
               <ws-input

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -289,7 +289,7 @@ export default {
     trainSee(row) {
             if (row.tranType == '汽运') {
         this.$router.push({
-          path: 'tranManagementReceivingloadingLook',
+          path: 'tranManagementTransporFeedbackLook',
           query: {
             id: row.id,
           },

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -75,7 +75,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号">
         </el-table-column>
         <el-table-column prop="goodsName" label="货名" >
         </el-table-column>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -461,7 +461,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''

src/views/tranManagement/tranManagementVehicle.vue

@@ -73,7 +73,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号" width="120">
+        <el-table-column prop="processNo" label="运输任务编号" >
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -422,7 +422,7 @@ export default {
               dispatchCat(tranCarInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('派车成功')
+                  this.$message.success('提交成功')
                   this.$router.go(-1)
                 })
             } else {