前端 sdy

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -299,6 +299,7 @@ export default {
             if (this.moveLookData[i].inOutType == '移库出库') {
               this.weightOut = this.moveLookData[i].weight
               this.retreat = this.moveLookData[i].stockReturnCount
+                 this.businessDescribe = this.moveLookData[i].businessDescribe
             } else {
               this.weightIn = this.moveLookData[i].weight
             }
@@ -309,7 +310,6 @@ export default {
             this.waterContent = this.moveLookData[0].waterContent
             this.weight = this.moveLookData[0].weight
             this.unitPrice = this.moveLookData[0].unitPrice
-            this.businessDescribe = this.moveLookData[0].businessDescribe
           }
         })
     },

src/views/taskManagement/tranManagementTransport.vue

@@ -472,10 +472,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
@@ -498,17 +494,6 @@ export default {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
 }
-// .completed.el-button--default {
-//   border-color: #5878e8;
-//   background-color: #f6f7fc;
-//   color: #5878e8;
-// }
-// .putstorage.el-button--default,
-// .deliverystorage.el-button--default {
-//   border-color: #8890b1;
-//   background-color: #fff;
-//   color: #8890b1;
-// }
 /deep/.el-table tr td:first-child,
 /deep/.el-table tr th.is-leaf:first-child {
   border-left: 1px solid #e9ecf7;
@@ -530,9 +515,6 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
-/deep/.base_header_layout .grid-content {
-  margin-bottom: 60px;
-}
 /deep/.el-table td,
 /deep/.el-table th.is-leaf {
   border-right: 1px solid #E9ECF7;

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -68,7 +68,7 @@
       <el-table
         class="wenzi"
         :data="gainList.records"
-        style="width: 100%; margin-top: 20px"
+        style="width: 100%;"
         height="780"
       >
         <el-table-column type="index" label="序号">
@@ -551,10 +551,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
 .vertical-text-left {
   width: 62px;
   text-align: right;
@@ -617,7 +613,6 @@ export default {
 .el-row {
   height: 50px;
 }
-
 .findValue {
   width: 0%;
   margin-left: 25%;
@@ -637,26 +632,6 @@ export default {
   background: #e8ecf6;
   box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
 }
-// .nav {
-//   background: white;
-//   height: 60px;
-//   margin-top: -20px;
-// }
-.navv {
-  background: #ffffff;
-  border-radius: 4px;
-  margin-top: -8px;
-}
-// .nav2{
-//   width: auto;
-//   height: 5px;
-//   background-color: #e8eaf1;
-// }
-.nav2 {
-  height: 25px;
-  background: #e8ecf6;
-  margin-top: 15px;
-}
 .spans {
   display: table-caption;
   width: 17px;

src/views/tranManagement/tranManagementDriver.vue

@@ -264,7 +264,7 @@
                 class="record1"
                 size="medium"
                 type="text"
-                style="font-size:14px"
+                style="font-size:14px;color:#F83535;"
                 @click="relieve(scope.row)"
                 >已禁用</el-button
               >

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -28,7 +28,7 @@
           />
         </ws-select>
        <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
         </div>
         <el-date-picker
           v-model="inOutDate"

src/views/tranManagement/tranManagementShipping.vue

@@ -23,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -28,8 +28,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -23,8 +23,8 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px; color: #8890b1"
-            >接单日期</span
+          <span style="display: inline-block; width: 70px; color: #8890b1"
+            >接单日期：</span
           >
         </div>
         <el-date-picker

src/views/tranManagement/tranManagementVehicle.vue

@@ -29,7 +29,7 @@
           />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
+          <span style="display: inline-block; width: 70px;color: #8890B1;">接单日期：</span>
         </div>
         <el-date-picker
           v-model="inOutDate"

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -1,4 +1,4 @@
-// 汽车调度
+// 汽车调度派车
 <template>
   <div class="container">
     <el-row>
@@ -103,7 +103,7 @@
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
-            :key='index'
+            :key="index"
           >
             <ws-info-table>
               <div class="catNos">
@@ -344,6 +344,7 @@ export default {
         },
       },
       accessoryTFs: false,
+      index:0,
     }
   },
   activated() {
@@ -373,7 +374,6 @@ export default {
       }
     },
     add() {
-      console.log(this.deptBudgetList.tranCarInfoList, 'sasasasas')
       this.deptBudgetList.tranCarInfoList.push({
         driverName: '',
         driverPhone: '',
@@ -387,9 +387,26 @@ export default {
         tranType: '1',
       })
     },
-    selectwaterContent() {},
     //提交按钮
     submit() {
+      for (var i = this.index; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
+          this.$message({
+            message: '姓名不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        for(var j = 0 ; j < this.carList.length ; j++){   
+           if (this.carList[j].driverName == this.deptBudgetList.tranCarInfoList[i].driver && this.carList[j].disableStatusFlag == 1) { 
+            this.$message({
+              message: this.deptBudgetList.tranCarInfoList[i].driver+'该司机已被禁用！',
+              type: 'warning',
+            })
+            return
+          }
+        }  
+      }
       this.$confirm(`提交成功后，任务将下发给司机，是否确定提交？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -428,6 +445,7 @@ export default {
         .toPromise()
         .then((response) => {
           if (response.tranCarInfoList.length > 0) {
+            this.index = response.tranCarInfoList.length
             for (var i = 0; i < response.tranCarInfoList.length; i++) {
               if (response.tranCarInfoList[i].id) {
                 response.tranCarInfoList[i].disabled = true
@@ -516,15 +534,15 @@ export default {
         }
       }
     },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    approve() {},
-    listQuery() {},
+    // selecttaskType(e) {
+    //   for (var i = 0; i < this.taskTypeList.length; i++) {
+    //     if (this.taskTypeList[i].value == e) {
+    //       this.searchType = this.taskTypeList[i].type
+    //     }
+    //   }
+    // },
+    // approve() {},
+    // listQuery() {},
   },
 }
 </script>

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -80,24 +80,6 @@
           <el-table-column prop="updateDate" label="保存时间">
           </el-table-column>
           <el-table-column prop="address" label="操作" width="200">
-            <!-- <template scope="scope"> -->
-            <!-- <ws-button
-            type="primary"
-             @click="edits(scope.row)"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "    
-            >编辑</ws-button
-          > -->
-            <!-- <ws-button
-            type="primary"
-            @click="handleDelete(scope.row)"
-            v-hasPermission="
-              `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-            "
-            >删除</ws-button
-          > -->
-            <!-- </template> -->
             <template slot-scope="scope">
               <div class="record" @click="edits(scope.row)">编辑</div>
               <div class="adjustment" @click="handleDelete(scope.row)">
@@ -245,7 +227,8 @@ export default {
             warehouseName: row.warehouseName,
             warehouseInOutDetail: row.warehouseInOutDetail,
             warehouseType: this.deptBudgetList.warehouseType,
-            createType: this.createType
+            createType: this.createType,
+            temporaryOutType : row.temporaryOutType
           
           },
         })
@@ -277,6 +260,7 @@ export default {
             warehouseName: row.warehouseName,
             warehouseInOutDetail: row.warehouseInOutDetail,
             warehouseType: this.deptBudgetList.warehouseType,
+             temporaryOutType : this.temporaryOutType
           },
         })
       }

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -192,7 +192,7 @@
             <!-- 出库类型 -->
             <ws-form-item label="出库类型" span="1">
               <ws-select
-                v-model="deptBudgetList.deliveryType"
+                v-model="dataList.temporaryOutType"
                 placeholder=""
                 class="typeselect"
               >
@@ -463,6 +463,7 @@ export default {
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.deptBudgetList.createType = this.$route.query.createType
+      this.dataList.temporaryOutType = this.$route.query.temporaryOutType
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementPut.vue

@@ -189,9 +189,10 @@
             v-show="checked == true && this.deptBudgetList.createType == 2"
           >
             <!-- 出库类型 -->
-            <ws-form-item label="出库类型" span="1">
+            <ws-form-item label="出库类型" span="1" prop="temporaryOutType">
+               <!-- v-model="deptBudgetList.deliveryType" -->
               <ws-select
-                v-model="deptBudgetList.deliveryType"
+                v-model="deptBudgetList.temporaryOutType"
                 placeholder=""
                 class="typeselect"
               >
@@ -425,6 +426,7 @@ export default {
     this.deptBudgetList.binNumber = this.$route.query.binNumber
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
     this.deptBudgetList.createType = this.$route.query.createType
+ 
     this.getList()
     this.deptBudgetList.goodsName = '玉米'
     this.deptBudgetList.goodsNameKey = '1'
@@ -588,14 +590,6 @@ export default {
         })
         return
       }
-
-      // if (this.deptBudgetList.netWeight > this.$route.query.capacity) {
-      //   this.$message({
-      //     message: '入库量大于该仓库容量！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -1269,22 +1263,6 @@ export default {
         query: { id: row.id },
       })
     },
-
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    // handleCloe() {
-    //   this.dialogViewSpareMoney = false
-    // },
-    // history(row) {
-    //   billoperatehis({ id: row.id })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.historyList = response
-    //     })
-    // },
-    // deletecontract(){},
-    //删除
-    approve() {},
-    listQuery() {},
   },
 }
 </script>