Browse Source

前端gjy

gjy 4 năm trước cách đây
mục cha
commit
f7394fb039

+ 56 - 62
src/views/tranManagement/tranManagementDriver.vue

@@ -27,14 +27,14 @@
           />
         </ws-select> -->
         <el-cascader
-            :options="options_"
-            v-model="searchTypeText"
-            clearable
-            size="large"
-            placeholder="请选择所在城市"
-            style="width: 30%"
-            @change="selecttaskType"
-          />
+          :options="options_"
+          v-model="searchTypeText"
+          clearable
+          size="large"
+          placeholder="请选择所在城市"
+          style="width: 30%"
+          @change="selecttaskType"
+        />
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按司机姓名、手机号、车牌号、身份证号查找"
@@ -43,7 +43,7 @@
           type="input"
           class="findValue"
         ></ws-input>
-         <ws-button
+        <ws-button
           type="primary"
           @click="handleLook()"
           v-hasPermission="
@@ -56,46 +56,46 @@
     <div class="connert">
       <el-table
         class="wenzi"
-        :data="driverList"
+        :data="driverList.records"
         style="width: 100%; margin-top: 20px"
         fit
         height="780"
       >
         <el-table-column type="index" label="序号">
-            <template scope="scope">
+          <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
-            </template>
+          </template>
         </el-table-column>
         <el-table-column prop="driverName" label="姓名" width="100">
         </el-table-column>
         <el-table-column prop="numberCard" label="身份证号" width="200">
         </el-table-column>
-         <el-table-column prop="driverPhone" label="手机号" width="120">
+        <el-table-column prop="driverPhone" label="手机号" width="120">
         </el-table-column>
-         <el-table-column prop="carNumber" label="车牌号" width="80">
+        <el-table-column prop="carNumber" label="车牌号" width="80">
         </el-table-column>
-         <el-table-column prop="binNumber" label="常驻城市" width="120">
+        <el-table-column prop="binNumber" label="常驻城市" width="120">
         </el-table-column>
-         <el-table-column prop="carModel" label="车型" width="80">
+        <el-table-column prop="carModel" label="车型" width="80">
         </el-table-column>
-         <el-table-column prop="carLength" label="车长" width="80">
+        <el-table-column prop="carLength" label="车长" width="80">
+        </el-table-column>
+        <el-table-column prop="addressUrl" label="附件">
+          <!-- <template slot-scope="scope">
+            <img
+              width="18"
+              height="20"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/fujian.png"
+              @click="fujian(scope.row)"
+              alt=""
+            />
+            <span v-if="scope.row.addressUrlArray.length > 0">{{
+              scope.row.addressUrlArray.length
+            }}</span>
+          </template> -->
         </el-table-column>
-         <el-table-column prop="addressUrl" label="附件">
-        <template slot-scope="scope">
-          <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian(scope.row)"
-            alt=""
-          />
-          <span v-if="scope.row.addressUrlArray.length > 0">{{
-            scope.row.addressUrlArray.length
-          }}</span>
-        </template>
-      </el-table-column>
         <el-table-column prop="address" label="操作" width="200">
           <ws-button
             type="primary"
@@ -113,7 +113,7 @@
             "
             >编辑</ws-button
           >
-           <ws-button
+          <ws-button
             type="primary"
             @click="deletes()"
             v-hasPermission="
@@ -132,25 +132,23 @@
           <!-- </template> -->
         </el-table-column>
       </el-table>
-       <el-pagination
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-      :current-page="currentPage"
-      :page-size="deptCircularPage.pageSize"
-      layout="total, sizes, prev, pager, next, jumper"
-      :total="deptBudgetTotal"
-    >
-    </el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
 <script>
-import {
-  selectDriver,
-  billoperatehis,
-} from '@/model/transport/index'
+import { selectDriver, billoperatehis } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
-import { regionData,CodeToText } from 'element-china-area-data'
+// provinceAndCityData省市二级
+import { provinceAndCityData, CodeToText } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
@@ -172,7 +170,7 @@ export default {
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
-      options_: regionData,
+      options_: provinceAndCityData,
       // 表格显示数据
       tableDate: [],
       // 是否显示
@@ -187,7 +185,7 @@ export default {
       contractType: 2,
       startDate: null,
       endDate: null,
-      searchTypeText:'',
+      searchTypeText: '',
       // 提交类型
       submitType: true,
       size: 10,
@@ -210,10 +208,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    console.log(regionData)
     this.getList()
     this.showType = this.isShow
   },
@@ -279,15 +273,15 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
+          // for (var i = 0; i < response.records.length; i++) {
+          //   if (response.records[i].addressUrl != null) {
+          //     response.records[i].addressUrlArray = response.records[
+          //       i
+          //     ].addressUrl.split(',')
+          //   } else {
+          //     response.records[i].addressUrlArray = []
+          //   }
+          // }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total

+ 337 - 255
src/views/tranManagement/tranManagementDriverAdd.vue

@@ -27,142 +27,162 @@
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
-    <div class="flex">
-       <div class="driver">司机信息</div>
-      <ws-info-table>
-        
-        <!--司机姓名-->
-        <ws-form-item
-          label="姓名"
-          span="1"
-          prop="contractNo"
-          class="readonly bg-right"
-        >
-          <ws-input
-            v-model="deptBudgetList.warehouseName"
-            placeholder="请输入司机姓名"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
-        <!--手机号-->
-        <ws-form-item label="手机号" span="1" prop="driverPhone" class="readonly">
-          <ws-input
-            v-model="deptBudgetList.personCharge"
-            placeholder="请输入手机号"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
+      <div class="flex">
+        <div class="driver">司机信息</div>
+        <ws-info-table>
+          <!--司机姓名-->
+          <ws-form-item
+            label="姓名"
+            span="1"
+            prop="contractNo"
+            class="readonly bg-right"
+          >
+            <ws-input
+              v-model="deptBudgetList.driverName"
+              placeholder="请输入司机姓名"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <!--手机号-->
+          <ws-form-item
+            label="手机号"
+            span="1"
+            prop="driverPhone"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.driverPhone"
+              placeholder="请输入手机号"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
 
-        <!--常驻城市-->
-        <ws-form-item label="常驻城市" span="1" prop="acceptanceMethod">
-          <el-cascader
-            :options="options_"
-            v-model="selectedOptions"
-            clearable
-            size="large"
-            placeholder="请选择常驻城市"
-            style="width: 200%"
-            class="el-cascader"
-            @change="handleChange"
-          />
-        </ws-form-item>
+          <!--常驻城市-->
+          <ws-form-item label="常驻城市" span="1" prop="acceptanceMethod">
+            <el-cascader
+              :options="options_"
+              v-model="selectedOptions"
+              clearable
+              size="large"
+              placeholder="请选择常驻城市"
+              style="width: 200%"
+              class="el-cascader"
+              @change="handleChange"
+            />
+          </ws-form-item>
 
-        <!--身份证号-->
-        <ws-form-item label="身份证号" span="1" prop="driverNo" class="readonly">
-          <ws-input
-            v-model="deptBudgetList.personCharge"
-            placeholder="请输入身份证号"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-      </ws-info-table>
-    </div>
+          <!--身份证号-->
+          <ws-form-item
+            label="身份证号"
+            span="1"
+            prop="driverNo"
+            class="readonly"
+          >
+            <ws-input
+              v-model="deptBudgetList.numberCard"
+              placeholder="请输入身份证号"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+        </ws-info-table>
+        {{ age }}
+      </div>
     </ws-form>
 
-<ws-form
+    <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
-     <div style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in freightspace"
-        >
-    <div class="flex">
-       <div class="driver">货车信息</div>
-      <ws-info-table class="el-table">
-        
-        <!--车牌号-->
-        <ws-form-item
-          label="车牌号"
-          span="1"
-          prop="carNumber"
-          class="forlist"
-          width="400px"
-        >
-          <ws-input
-            v-model="deptBudgetList.drivercarInfo.carNumber"
-            placeholder="请输入车牌号"
-            maxlength="20"
-            size="small"
-          />
-        </ws-form-item>
-        <!--车型-->
-        <ws-form-item label="车型" span="1" prop="carModel" class="forlist">
-          <ws-select
-            v-model="deptBudgetList.drivercarInfo.carModel"
-            placeholder=""
-            class="typeselect"
-            @change="selectcarModel"
-          >
-            <ws-option
-              v-for="item in carModelList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            />
-          </ws-select>
-        </ws-form-item>
-        <!--车长-->
-        <ws-form-item label="不含车头车长(米)" span="1" prop="carLength" class="forlist">
-           <ws-select
-            v-model="deptBudgetList.drivercarInfo.carLength"
-            placeholder=""
-            class="typeselect"
-            @change="selectcarLength"
-          >
-            <ws-option
-              v-for="item in carLengthList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            />
-          </ws-select>
-        </ws-form-item>
-        <!--载重-->
-        <ws-form-item label="载重" span="1" prop="carLoad" class="forlist">
-          <ws-input
-            v-model="deptBudgetList.drivercarInfo.carLoad"
-            placeholder="请输入载重"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
+      <div
+        style="width: 100%"
+        class="flex position"
+        v-for="(item, index) in freightspace"
+      >
+        <div class="flex">
+          <div class="driver">货车信息-{{ index + 1 }}</div>
+          <ws-info-table class="el-table">
+            <!--车牌号-->
+            <ws-form-item
+              label="车牌号"
+              span="1"
+              prop="carNumber"
+              class="forlist"
+              width="400px"
+            >
+              <ws-input
+                v-model="item.carNumber"
+                placeholder="请输入车牌号"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--车型-->
+            <ws-form-item label="车型" span="1" prop="carModel" class="forlist">
+              <ws-select
+                v-model="item.carModel"
+                placeholder=""
+                class="typeselect"
+                @change="selectcarModel"
+              >
+                <ws-option
+                  v-for="item in carModelList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <!--车长-->
+            <ws-form-item
+              label="不含车头车长(米)"
+              span="1"
+              prop="carLength"
+              class="forlist"
+            >
+              <ws-select
+                v-model="item.carLength"
+                placeholder=""
+                class="typeselect"
+                @change="selectcarLength"
+              >
+                <ws-option
+                  v-for="item in carLengthList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <!--载重-->
+            <ws-form-item label="载重" span="1" prop="carLoad" class="forlist">
+              <ws-input
+                v-model="item.carLoad"
+                placeholder="请输入载重"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
 
-        <!--出厂年份-->
-        <ws-form-item label="出厂年份" span="1" prop="yearManufacture" class="forlist">
-          <ws-input
-            v-model="deptBudgetList.drivercarInfo.yearManufacture"
-            placeholder="请输入年份"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-      </ws-info-table>
-        <img
+            <!--出厂年份-->
+            <ws-form-item
+              label="出厂年份"
+              span="1"
+              prop="yearManufacture"
+              class="forlist"
+            >
+              <ws-input
+                v-model="item.yearManufacture"
+                placeholder="请输入年份"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+          </ws-info-table>
+          <img
             width="22"
             height="22"
             class="add"
@@ -178,89 +198,120 @@
             src="../../../public/img/del.png"
             alt=""
           />
-    </div>
-     </div>
+        </div>
+      </div>
     </ws-form>
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
-     <div style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in freightspace1"
-        >
-    <div class="flex">
-       <div class="driver">收款人账户信息</div>
-      <ws-info-table class="el-table">
-        
-        <!--账户类型-->
-        <ws-form-item
-          label="账户类型"
-          span="1"
-          prop="contractNo"
-          class="el-car bg-right"
-        >
-          <el-radio v-model="radio" label="1">私人账号</el-radio>
-          <el-radio v-model="radio" label="2">企业账户</el-radio>
-        </ws-form-item>
-        <!--账号-->
-        <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
-          <ws-input
-            v-model="deptBudgetList.driverPayeeInfo.bankCard"
-            placeholder="请输入账号"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-        <!--开户行-->
-        <ws-form-item label="开户行" span="1" prop="bankDeposit" class="el-car">
-          <ws-input
-            v-model="deptBudgetList.driverPayeeInfo.bankDeposit"
-            placeholder="请输入开户行"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-        <!--姓名-->
-        <ws-form-item label="姓名" v-if="radio==1" span="1" prop="payeeName" class="el-car" width="150px">
-          <ws-input
-            v-model="deptBudgetList.driverPayeeInfo.payeeName"
-            placeholder="请输入姓名"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-        <!--企业名称-->
-        <ws-form-item label="企业名称" v-else span="1" prop="compName" class="el-car" width="150px">
-          <ws-input
-            v-model="deptBudgetList.driverPayeeInfo.compName"
-            placeholder="请输入企业名称"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
+      <div
+        style="width: 100%"
+        class="flex position"
+        v-for="(item, index) in freightspace1"
+      >
+        <div class="flex">
+          <div class="driver">收款人账户信息-{{ index + 1 }}</div>
+          <ws-info-table class="el-table">
+            <!--账户类型-->
+            <ws-form-item
+              label="账户类型"
+              span="1"
+              prop="contractNo"
+              class="el-car bg-right"
+            >
+              <el-radio v-model="item.radio" label="1">私人账号</el-radio>
+              <el-radio v-model="item.radio" label="2">企业账户</el-radio>
+            </ws-form-item>
+            <!--账号-->
+            <ws-form-item label="账号" span="1" prop="bankCard" class="el-car">
+              <ws-input
+                v-model="item.bankCard"
+                placeholder="请输入账号"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <!--开户行-->
+            <ws-form-item
+              label="开户行"
+              span="1"
+              prop="bankDeposit"
+              class="el-car"
+            >
+              <ws-input
+                v-model="item.bankDeposit"
+                placeholder="请输入开户行"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <!--姓名-->
+            <ws-form-item
+              label="姓名"
+              v-if="item.radio == 1"
+              span="1"
+              prop="payeeName"
+              class="el-car"
+              width="150px"
+            >
+              <ws-input
+                v-model="item.payeeName"
+                placeholder="请输入姓名"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <!--企业名称-->
+            <ws-form-item
+              label="企业名称"
+              v-else
+              span="1"
+              prop="compName"
+              class="el-car"
+              width="150px"
+            >
+              <ws-input
+                v-model="item.compName"
+                placeholder="请输入企业名称"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
 
-        <!--身份证号-->
-        <ws-form-item label="身份证号" v-if="radio==1" span="1" prop="payeeNumberCard" class="el-car">
-          <ws-input
-            v-model="deptBudgetList.driverPayeeInfo.payeeNumberCard"
-            placeholder="请输入身份证号"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
-        <!--身份证附件-->
-        <ws-form-item label="身份证附件" v-if="radio==1" span="1" prop="cardAddressUrl" class="el-car">
-          <!-- <ws-input
+            <!--身份证号-->
+            <ws-form-item
+              label="身份证号"
+              v-if="item.radio == 1"
+              span="1"
+              prop="payeeNumberCard"
+              class="el-car"
+            >
+              <ws-input
+                v-model="item.payeeNumberCard"
+                placeholder="请输入身份证号"
+                maxlength="100"
+                size="small"
+              />
+            </ws-form-item>
+            <!--身份证附件-->
+            <ws-form-item
+              label="身份证附件"
+              v-if="item.radio == 1"
+              span="1"
+              prop="cardAddressUrl"
+              class="el-car"
+            >
+              <!-- <ws-input
             v-model="deptBudgetList.driverPayeeInfo.personNo"
             placeholder="请输入身份证附件"
             maxlength="100"
             size="small"
           /> -->
-        </ws-form-item>
-      </ws-info-table>
-        <img
+            </ws-form-item>
+          </ws-info-table>
+          <img
             width="22"
             height="22"
             class="add"
@@ -276,29 +327,29 @@
             src="../../../public/img/del.png"
             alt=""
           />
-    </div>
-     </div>
+        </div>
+      </div>
     </ws-form>
-        <ws-form
+    <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
       :model="deptBudgetList"
     >
-    <div class="flex">
-       <div class="driver">相关附件</div>
-     <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.addressUrl"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        @onChange="onChange"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </div>
+      <div class="flex">
+        <div class="driver">相关附件</div>
+        <ws-upload
+          ref="upload"
+          table-name="maintain_work_order"
+          oss-key="mainPlan"
+          :comp-id="compId"
+          :appendix-ids="appendixIdsAdd"
+          :vesselId="deptBudgetList.addressUrl"
+          :size-limit="size"
+          @uploadSuccess="uploadSuccess"
+          @onChange="onChange"
+          accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        />
+      </div>
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
@@ -313,13 +364,9 @@
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {
-  packList
-} from '@/model/contarct/index'
-import {
-  addDriver
-} from '@/model/transport/index'
+import { provinceAndCityData, CodeToText } from 'element-china-area-data'
+import { packList } from '@/model/contarct/index'
+import { addDriver } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -347,9 +394,9 @@ export default {
         driverPayeeInfo: {},
       },
       radio: '1',
-      carModelList:[],
-      carLengthList:[],
-      options_: regionData,
+      carModelList: [],
+      carLengthList: [],
+      options_: provinceAndCityData,
       heightData: '600px',
       zoom: 7,
       selectedOptions: [],
@@ -364,20 +411,53 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
-      freightspace: [{ carNumber: '', carModel: '', carLength: '', carLoad: '', yearManufacture: '' }],
-      freightspace1: [{account_type:''  }],
+      freightspace: [
+        {
+          carNumber: '',
+          carModel: '高栏',
+          carModelKey: '1',
+          carLength: '13',
+          carLengthKey: '1',
+          carLoad: '',
+          yearManufacture: '',
+        },
+      ],
+      freightspace1: [
+        {
+          account_type: '',
+          radio: '1',
+          payeeName: '',
+          payeeNumberCard: '',
+          compName: '',
+          bankDeposit: '',
+          bankCard: '',
+        },
+      ],
       name: '',
+      age: '',
     }
   },
   activated() {
-    this.deptBudgetList.drivercarInfo.carModel = '高栏'
-    this.deptBudgetList.drivercarInfo.carLength = '13'
     this.loaddata()
     this.showType = this.isShow
   },
-  computed: {
-  },
+  computed: {},
   methods: {
+    IdCard(UUserCard) {
+      //获取年龄
+      var myDate = new Date()
+      var month = myDate.getMonth() + 1
+      var day = myDate.getDate()
+      var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+      if (
+        UUserCard.substring(10, 12) < month ||
+        (UUserCard.substring(10, 12) == month &&
+          UUserCard.substring(12, 14) <= day)
+      ) {
+        age++
+      }
+      this.age = age
+    },
     loaddata() {
       // 车型
       packList({ constId: 'TRAN1' })
@@ -385,7 +465,7 @@ export default {
         .then((response) => {
           this.carModelList = response
         })
-        // 车长
+      // 车长
       packList({ constId: 'TRAN2' })
         .toPromise()
         .then((response) => {
@@ -403,8 +483,10 @@ export default {
     add() {
       this.freightspace.push({
         carNumber: '',
-        carModel: '',
-        carLength: '',
+        carModel: '高栏',
+        carModelKey: '1',
+        carLength: '13',
+        carLengthKey: '1',
         carLoad: '',
         yearManufacture: '',
       })
@@ -416,9 +498,13 @@ export default {
     },
     add1() {
       this.freightspace1.push({
-        binNumber: '',
-        maxStorage: '',
-        remark: '',
+        account_type: '',
+        radio: '1',
+        payeeName: '',
+        payeeNumberCard: '',
+        compName: '',
+        bankDeposit: '',
+        bankCard: '',
       })
     },
     del1(index) {
@@ -473,14 +559,12 @@ export default {
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
-          this.deptBudgetList.warehousePrivate =
+          this.deptBudgetList.residentCityProvincial =
             CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.warehouseCity =
+          this.deptBudgetList.residentCityMunicipal =
             CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.warehouseArea =
-            CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.warehousePositionInfoList = this.freightspace
-          this.deptBudgetList.totalStorage = this.totalStorage
+          this.deptBudgetList.driverCarInfoList = this.freightspace
+          this.deptBudgetList.driverPayeeInfoList = this.freightspace1
           addDriver(this.deptBudgetList)
             .toPromise()
             .then((response) => {
@@ -532,7 +616,7 @@ export default {
   position: relative;
 }
 .el-car {
-  width:413px ;
+  width: 413px;
 }
 .title::before {
   content: '';
@@ -647,9 +731,9 @@ export default {
   margin: 0 auto;
 }
 .driver {
-    width: 120px;
-    margin-top: 10px;
-    font-weight: bold;
+  width: 120px;
+  margin-top: 10px;
+  font-weight: bold;
 }
 
 // 控制select为只读的时候显示样式
@@ -686,20 +770,18 @@ export default {
   width: 145px;
 }
 .forlist {
-  width:20%;
+  width: 20%;
 }
 .el-form-item.forlist.is-success.el-form-item--small {
-    width: 20%;
+  width: 20%;
 }
 .el-form-item.forlist.el-form-item--small {
-    width: 20%;
+  width: 20%;
 }
 .el-form-item.readonly.is-success.el-form-item--small.showLableToopTip {
-    width: 20%;
+  width: 20%;
 }
 .el-form-item.el-car.el-form-item--small {
-    width: 33.3%;
+  width: 33.3%;
 }
-
-
 </style>

+ 2 - 2
vue.config.js

@@ -143,9 +143,9 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
+        target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.124:8090/',
-        // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.119:8090/',
+        // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址