Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/contractManagement/salesContractAdd.vue

@@ -547,7 +547,7 @@
           type="textarea"
           row="3"
           placeholder="请输入备注信息，不超过200字"
-          maxlength="200"
+          maxlength="3000"
         />
        <ws-upload
         ref="upload"

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -55,6 +55,9 @@
           <el-select
             v-model="deptBudgetList.contractNo"
             placeholder="请选择编号"
+            @change=" (val) => {
+                  selectcontractNo(val)
+                }"
           >
             <el-option
               v-for="item in contractNoList"
@@ -65,18 +68,12 @@
           </el-select>
         </el-form-item>
         <el-form-item prop="goodsName" label="货名" span="1">
-          <el-select
+            <el-input
+            disabled
             v-model="deptBudgetList.goodsName"
             placeholder="请输入货名"
-            @change="selectgoodsname"
-          >
-            <el-option
-              v-for="item in goodnameList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            ></el-option>
-          </el-select>
+            size="small"
+          ></el-input>
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
           <el-input
@@ -427,8 +424,8 @@ export default {
       deptBudgetList: {
         taskNo: '',
         totalStorage: 0,
-        goodsName: '玉米',
-        goodsNameKey: 1,
+        // goodsName: '玉米',
+        // goodsNameKey: 1,
         warehouseType: '1',
         tranProcessInfoList: [
           {
@@ -563,6 +560,13 @@ export default {
         }
       }
     },
+    selectcontractNo(val) {
+      for (var i = 0; i < this.contractNoList.length; i++) {
+        if (this.contractNoList[i].contractNo == val) {
+            this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
+        }
+      }
+    },
     sendWarehousechange1(e) {
       for (let i = 0; i < this.warehouseList1.length; i++) {
         if (this.warehouseList1[i].warehouseName == e) {

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -53,6 +53,9 @@
           <el-select
             v-model="deptBudgetList.contractNo"
             placeholder="请选择编号"
+             @change=" (val) => {
+                  selectcontractNo(val)
+                }"
           >
             <el-option
               v-for="item in contractNoList"
@@ -62,19 +65,13 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="goodsName" label="货名" span="1">
-          <el-select
+         <el-form-item prop="goodsName" label="货名" span="1">
+            <el-input
+            disabled
             v-model="deptBudgetList.goodsName"
             placeholder="请输入货名"
-            @change="selectgoodsname"
-          >
-            <el-option
-              v-for="item in goodnameList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            ></el-option>
-          </el-select>
+            size="small"
+          ></el-input>
         </el-form-item>
         <el-form-item label="重量（吨）" span="1" prop="weight">
           <el-input
@@ -500,6 +497,13 @@ export default {
         }
       }
     },
+    selectcontractNo(val) {
+      for (var i = 0; i < this.contractNoList.length; i++) {
+        if (this.contractNoList[i].contractNo == val) {
+            this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
+        }
+      }
+    },
     sendWarehousechange1(e){
        for (let i = 0; i < this.warehouseList1.length; i++) {
         if (this.warehouseList1[i].warehouseName == e) {

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -931,14 +931,14 @@ export default {
         EventBus.$emit('error', '驾驶证不能为空')
         return
       }
-      if (!this.addressUrls.way) {
-        EventBus.$emit('error', '道路运营证不能为空')
-        return
-      }
-      if (!this.addressUrls.qualification) {
-        EventBus.$emit('error', '从业资格证不能为空')
-        return
-      }
+      // if (!this.addressUrls.way) {
+      //   EventBus.$emit('error', '道路运营证不能为空')
+      //   return
+      // }
+      // if (!this.addressUrls.qualification) {
+      //   EventBus.$emit('error', '从业资格证不能为空')
+      //   return
+      // }
       if (!this.addressUrls.identityjust) {
         EventBus.$emit('error', '身份证正面不能为空')
         return

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -23,6 +23,24 @@
             style="color: #8890b1"
           />
         </ws-select>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >类型：</span
+        >
+        <ws-select
+          v-model="tranTypeKeyText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttranType"
+          :value="tranTypeKey"
+        >
+          <ws-option
+            v-for="item in tranTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
         <div>
           <span style="display: inline-block; width: 70px; color: #8890b1"
             >接单日期：</span
@@ -218,6 +236,8 @@ export default {
       feedbackFlag: 4,
       searchType: 1,
       searchTypeText: '执行中',
+      tranTypeKey:4,
+      tranTypeKeyText: '全部',
       searchKeyWord: '',
       contractType: 2,
       taskTypeList: [
@@ -225,7 +245,12 @@ export default {
         { value: '已完货', type: 5 },
         { value: '全部任务', type: 3 },
       ],
-
+      tranTypeList: [
+        { value: '汽运', type: 1 },
+        { value: '火运', type: 2 },
+        { value: '船运', type: 3 },
+        { value: '全部', type: 4 },
+      ],
       // 提交类型
       submitType: true,
       size: 10,
@@ -259,6 +284,7 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        tranTypeKey:this.tranTypeKey,
         feedbackFlag: this.feedbackFlag,
         startDate: this.startDate,
         endDate: this.endDate,
@@ -451,6 +477,15 @@ export default {
           this.feedbackFlag = this.taskTypeList[i].type
         }
       }
+      this.getList()
+    },
+    selecttranType(e) {
+      for (var i = 0; i < this.tranTypeList.length; i++) {
+        if (this.tranTypeList[i].value == e) {
+          this.tranTypeKey = this.tranTypeList[i].type
+        }
+      }
+      this.getList()
     },
     fujian(row) {
       if (

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -23,6 +23,24 @@
             style="color: #8890b1"
           />
         </ws-select>
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >类型：</span
+        >
+        <ws-select
+          v-model="tranTypeKeyText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttranType"
+          :value="tranTypeKey"
+        >
+          <ws-option
+            v-for="item in tranTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
         <div>
           <span style="display: inline-block; width: 70px; color: #8890b1"
             >接单日期：</span
@@ -209,10 +227,12 @@ export default {
       pageSize: 10,
       deptBudgetTotal: 0,
       searchType: 1,
+      tranTypeKey:4,
+      tranTypeKeyText: '全部',
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
-      tranTypeKey: 2,
+      // tranTypeKey: 2,
       feedbackFlag: 1,
       searchTypeOne: 1,
       taskTypeList: [
@@ -220,6 +240,12 @@ export default {
         { value: '已完货', type: 2 },
         { value: '全部任务', type: 3 },
       ],
+      tranTypeList: [
+        { value: '汽运', type: 1 },
+        { value: '火运', type: 2 },
+        { value: '船运', type: 3 },
+        { value: '全部', type: 4 },
+      ],
       // 提交类型
       submitType: true,
       size: 10,
@@ -371,6 +397,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         feedbackFlag: this.feedbackFlag,
+        tranTypeKey:this.tranTypeKey,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         startDate: this.startDate,
@@ -424,6 +451,15 @@ export default {
           this.feedbackFlag = this.taskTypeList[i].type
         }
       }
+      this.getList()
+    },
+    selecttranType(e) {
+      for (var i = 0; i < this.tranTypeList.length; i++) {
+        if (this.tranTypeList[i].value == e) {
+          this.tranTypeKey = this.tranTypeList[i].type
+        }
+      }
+      this.getList()
     },
     find() {
       if (this.inOutDate != null) {