前端

src/api/V2/transport/index.js

@@ -60,4 +60,8 @@ export const API_POST_AUTOMOBILE_TRANPRICE_CAR  = '/tranProcessInfo/api/setUpTra
 // 删除运输车辆
 export const API_POST_DEL_HAULAGE_STAGE= '/tranCarInfo/api/deleteTranCar'
 // 导入
-export const API_GET_IMPORT= '/importController/readDocument'
+export const API_GET_IMPORT= '/importController/readDocument'
+// 车牌号列表
+export const API_GET_CARNUMBER= '/driverCarInfo/selectAllCarNumber'
+// 通过车牌号查找司机
+export const API_GET_DRIVERINFO='/driverViewInfo/selectDriverViewList'

src/model/transport/index.js

@@ -33,7 +33,9 @@ import {
     API_GET_IMPORT,
     API_GET_TRANPROCESSINFO,
     API_POST_TRANPROCESSINFO,
-    API_POST_AUTOMOBILE_TRANPRICE_CAR
+    API_POST_AUTOMOBILE_TRANPRICE_CAR,
+    API_GET_CARNUMBER,
+    API_GET_DRIVERINFO
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -96,4 +98,8 @@ export const setUpTranPriceCar = appRx.post(API_POST_AUTOMOBILE_TRANPRICE_CAR, e
 //删除车辆
 export const delhaulagestage = appRx.post(API_POST_DEL_HAULAGE_STAGE, errorCatcher, errorHandle, filter)
 // 导入
-export const importApplFileUrl = appRx.get(API_GET_IMPORT, errorCatcher, errorHandle, filter)
+export const importApplFileUrl = appRx.get(API_GET_IMPORT, errorCatcher, errorHandle, filter)
+// 车牌号
+export const getcarNumber = appRx.get(API_GET_CARNUMBER, errorCatcher, errorHandle, filter)
+// 根据车牌号查找司机
+export const getdriverinfo = appRx.get(API_GET_DRIVERINFO, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -236,8 +236,7 @@
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取，不可编辑" maxlength="100" disabled
                     size="small" />
                 </ws-form-item>
-
-                <ws-form-item v-if='statusTypetext == "初检" && serviceManagementType == 1' label="运费(元/吨)" span="1"
+                <!-- <ws-form-item v-if='statusTypetext == "初检" && serviceManagementType == 1' label="运费(元/吨)" span="1"
                   prop="freight">
                   <ws-input v-model="deptBudgetList.freight" placeholder="请输入运费" size="small" type="number"
                     @mousewheel.native.prevent />
@@ -246,7 +245,7 @@
                       position: relative;
                       top: -1px;
                     " src="../../../public/img/edit.png" @click="editClick(2)" alt="" />
-                </ws-form-item>
+                </ws-form-item> -->
                 <ws-form-item v-if='serviceManagementType == 1' label="入库类型" span="1">
                   <ws-select v-model="deptBudgetList.inOutType" placeholder class="typeselect"
                     @change="selectstorageType" :disabled="isSelectType">
@@ -1514,27 +1513,27 @@ export default {
           })
           return
         }
-        if (!String(this.deptBudgetList.freight)) {
-          this.$message({
-            message: '运费不能为空',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.freight < 0 ||
-          this.deptBudgetList.freight > 100000 ||
-          (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
-            String(this.deptBudgetList.freight).length -
-            (String(this.deptBudgetList.freight).indexOf('.') + 1) >
-            2)
-        ) {
-          this.$message({
-            message: '运费输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!String(this.deptBudgetList.freight)) {
+        //   this.$message({
+        //     message: '运费不能为空',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.deptBudgetList.freight < 0 ||
+        //   this.deptBudgetList.freight > 100000 ||
+        //   (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.freight).length -
+        //     (String(this.deptBudgetList.freight).indexOf('.') + 1) >
+        //     2)
+        // ) {
+        //   this.$message({
+        //     message: '运费输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         if (!this.deptBudgetList.inOutDate) {
           this.$message({
             message: '入库日期不能为空！',
@@ -1992,7 +1991,7 @@ export default {
       if (this.reader) {
         this.reader.cancel()
       }
-      if(this.qyJurisdiction&&this.serviceManagementType==1&&this.statusTypetext=='初检'){
+      if(this.qyJurisdiction&&this.serviceManagementType==1&&this.statusTypetext=='初检'&&!this.zjJurisdiction&&!this.fjJurisdiction&&!this.qrJurisdiction){
         this.$message({
             message: '钎样员只能进行收购入库添加',
             type: 'warning',
@@ -2054,27 +2053,27 @@ export default {
             })
             return
           }
-          if (!String(this.deptBudgetList.freight)) {
-            this.$message({
-              message: '运费不能为空',
-              type: 'warning',
-            })
-            return
-          }
-          if (
-            this.deptBudgetList.freight < 0 ||
-            this.deptBudgetList.freight > 100000 ||
-            (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
-              String(this.deptBudgetList.freight).length -
-              (String(this.deptBudgetList.freight).indexOf('.') + 1) >
-              2)
-          ) {
-            this.$message({
-              message: '运费输入错误',
-              type: 'warning',
-            })
-            return
-          }
+          // if (!String(this.deptBudgetList.freight)) {
+          //   this.$message({
+          //     message: '运费不能为空',
+          //     type: 'warning',
+          //   })
+          //   return
+          // }
+          // if (
+          //   this.deptBudgetList.freight < 0 ||
+          //   this.deptBudgetList.freight > 100000 ||
+          //   (String(this.deptBudgetList.freight).indexOf('.') != -1 &&
+          //     String(this.deptBudgetList.freight).length -
+          //     (String(this.deptBudgetList.freight).indexOf('.') + 1) >
+          //     2)
+          // ) {
+          //   this.$message({
+          //     message: '运费输入错误',
+          //     type: 'warning',
+          //   })
+          //   return
+          // }
           if (!this.deptBudgetList.inOutDate) {
             this.$message({
               message: '入库日期不能为空！',

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -177,7 +177,15 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
-                  
+                  <!-- <el-select :disabled="item.status == '已装车'" v-model="item.carNo" placeholder="请选择车牌号"
+                    filterable clearable class="row-item" @change="
+                               (val) => {
+                                 carNochange(val, item.tranCarIndex)
+                               }
+                             ">
+                    <el-option v-for="(items, index) in carNoList" :key="index" :label="items.carNumber"
+                      :value="items.carNumber" />
+                  </el-select> -->
                   <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
@@ -282,7 +290,9 @@
     dispatchCat,
     delhaulagestage,
     setUpTranPrice,
-    setUpTranPriceCar
+    setUpTranPriceCar,
+    getcarNumber,
+    getdriverinfo
   } from '@/model/transport/index'
   // import { dayjs, fmoney, EventBus } from 'base-core-lib'
   import {
@@ -317,6 +327,7 @@
         startDate: null,
         endDate: null,
         carList: [],
+        carNoList:[],
         // 提交类型
         readonly: true,
         tranPriceApprove: {},
@@ -868,6 +879,13 @@
           .then((response) => {
             this.carList = response
           })
+          getcarNumber({
+            compId: this.compId
+          })
+          .toPromise()
+          .then((response) => {
+            this.carNoList = response
+          })
       },
       carchange(val, index) {
         for (var i = 0; i < this.carList.length; i++) {
@@ -901,6 +919,35 @@
           }
         }
       },
+      carNochange(val,index){
+        for (var i = 0; i < this.carNoList.length; i++) {
+          if (this.carNoList[i].carNumber == val) {
+            console.log(this.carNoList[i])
+            if (this.carNoList[i].carLoad != null) {
+                  this.deptBudgetList.tranCarInfoList[index].loadWeight =
+                  this.carNoList[i].carLoad
+                } else {
+                  this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
+                }
+                this.deptBudgetList.tranCarInfoList[index].carModel =
+                this.carNoList[i].carModel
+                this.deptBudgetList.tranCarInfoList[index].carLength =
+                this.carNoList[i].carLength
+                this.deptBudgetList.tranCarInfoList[index].carLengthKey =
+                this.carNoList[i].carLengthKey
+                this.deptBudgetList.tranCarInfoList[index].carModelKey =
+                this.carNoList[i].carModelKey
+            getdriverinfo({
+              carNumber: this.carNoList[i].carNumber
+              })
+              .toPromise()
+              .then((response) => {
+                console.log(this, response)
+                
+              })
+          }
+        }
+      },
       phonechange(val, index) {
         for (var i = 0; i < this.carList.length; i++) {
           if (this.carList[i].driverPhone == val) {

src/views/warehousenew/warehousingOrder.vue

@@ -133,7 +133,7 @@
         <el-table-column prop="requestFunds"  width="130" class="table_td tablerequestFunds" label="请款">
           <template scope="scope">
             <span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
-            <el-input v-else v-model='scope.row.requestFunds'></el-input>
+            <el-input  @focus="qingkuan(scope.row.requestFunds)" v-else v-model='scope.row.requestFunds'></el-input>
           </template>
         </el-table-column>
          <el-table-column prop="remark"  width="80" class="table_td" label="请款备注">
@@ -371,6 +371,25 @@
           <el-button type="primary" @click="fieldrationssubmit">提交</el-button>
         </span>
       </el-dialog>
+      <el-dialog
+      title="输入内容"
+      :visible.sync="dialogVisiblecontent"
+      width="30%"
+      :before-close="handleClose">
+      <div> 
+        <el-input
+        type="textarea"
+        :rows="5"
+        maxlength="500"
+        placeholder="请输入内容"
+        v-model="textarea">
+      </el-input>
+        <ws-button type="primary" @click="handleAdd()" v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.add`
+              ">确认
+            </ws-button>
+      </div>
+    </el-dialog>
       <!-- <el-dialog
       title="提示"
       :visible.sync="dialogVisible"
@@ -482,6 +501,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         dataList:[],
         payeeinfo:{},
         options:[],
+        textarea:'',
+        dialogVisiblecontent:false,
         // 船舶类型
         monetaryKey: null,
         form:{
@@ -597,7 +618,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         accessoryTFs: false,
         remarkList: false,
         dialogTitle:'',
-
+        titletype:'',
         remark:''
       }
     },
@@ -611,6 +632,11 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       this.showType = this.isShow
     },
     methods: {
+      qingkuan(item){
+        this.titletype='请款'
+        this.textarea=item
+        this.dialogVisiblecontent=true
+      },
       interestratesubmit(){
         setenabledinfo({id:this.interestratevalue.id,value:this.interestratevalue.value}).toPromise()
               .then((response) => {