Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/landTransportation/bulkCargo.js

@@ -8,3 +8,11 @@ export function saveSaveList(data) {
         data: data
     })
 }
+// 单据提交
+export function saveDelegationList(data) {
+    return request({
+        url: '/api/blade-land/order/submitBulkLoad',
+        method: 'post',
+        data: data
+    })
+}

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -371,6 +371,7 @@
           <template slot-scope="scope">
             <el-date-picker
                 format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 v-model="scope.row.freightTime"
                 type="datetime"
                 style="width: 100%;"
@@ -527,7 +528,6 @@
             align="center"
             width="60">
         </el-table-column>
-
         <el-table-column
             property="freightTime"
             label="货运日期"
@@ -536,6 +536,7 @@
           <template slot-scope="scope">
             <el-date-picker
                 format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 v-model="scope.row.freightTime"
                 type="datetime"
                 style="width: 100%;"
@@ -556,7 +557,7 @@
                 :disabled="goodsForm.status !== 0"
                 v-model="scope.row.freightPlaceId"
                 @clear="clear(scope.row)"
-                @getCorpData="(row)=>{withAddress(row,scope)}"/>
+                @getCorpData="(row)=>{withAddressTwo(row,scope)}"/>
           </template>
         </el-table-column>
         <el-table-column
@@ -1330,11 +1331,11 @@ export default {
           },
           change: (data) => {
             if (data.value === '集装箱') {
-              this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = true
+              this.findObject(this.goodsOptionForm.column, "dispatchNumber").rules[0].required = true
             } else if (!data.value) {
-              this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = true
+              this.findObject(this.goodsOptionForm.column, "dispatchNumber").rules[0].required = true
             } else {
-              this.findObject(this.goodsOptionForm.column, "billNo").rules[0].required = false
+              this.findObject(this.goodsOptionForm.column, "dispatchNumber").rules[0].required = false
             }
           }
         }, {
@@ -2443,15 +2444,6 @@ export default {
             this.$refs['goodsForm'].validate((valid, done) => {
               done();
               if (valid) {
-                let data = JSON.parse(JSON.stringify(this.tableData))
-                data.forEach((item, index) => {
-                  item.sort = index + 1
-                  // if (item.region.length !== 0) {
-                  //   item.region = item.region.join(',')
-                  // } else {
-                  //   item.region = ''
-                  // }
-                })
                 this.entrustList.forEach(item => {
                   if (!item.arrivalTime) {
                     item.arrivalTime = this.goodsForm.arrivalTime
@@ -2461,7 +2453,8 @@ export default {
                 saveSaveList({
                   ...this.goodsForm,
                   kind: '1',
-                  orderAddressList: data,
+                  loadingAddressList:this.tableData,
+                  unloadedAddressList:this.tableDataTwo,
                   fileList: this.orderFilesList,
                   itemList: this.entrustList,
                   orderFeeList: this.collectionList.concat(this.paymentList)
@@ -2575,7 +2568,7 @@ export default {
       // this.tableData[scope.$index].tel = row.tel
       // this.tableData[scope.$index].address = row.storageAddr
       if (!scope.row.key) scope.row.key = 0
-      this.$set(this.tableData[scope.$index], 'corpName', row.cname)
+      this.$set(this.tableData[scope.$index], 'freightPlaceName', row.cname)
       // this.tableData[scope.$index].corpName = row.cname
       if (row.belongtoarea) {
         addressList(row.belongtoarea.split(',')[0]).then(res => {
@@ -2584,6 +2577,24 @@ export default {
         })
       }
     },
+    //选择地址客户带出地址
+    withAddressTwo(row, scope) {
+      this.$set(this.tableDataTwo[scope.$index], 'contacts', row.attn)
+      this.$set(this.tableDataTwo[scope.$index], 'tel', row.tel)
+      this.$set(this.tableDataTwo[scope.$index], 'address', row.storageAddr)
+      // this.tableData[scope.$index].contacts = row.attn
+      // this.tableData[scope.$index].tel = row.tel
+      // this.tableData[scope.$index].address = row.storageAddr
+      if (!scope.row.key) scope.row.key = 0
+      this.$set(this.tableDataTwo[scope.$index], 'freightPlaceName', row.cname)
+      // this.tableData[scope.$index].corpName = row.cname
+      if (row.belongtoarea) {
+        addressList(row.belongtoarea.split(',')[0]).then(res => {
+          this.tableDataTwo[scope.$index].region = [res.data.data.provinceCode, res.data.data.parentId, res.data.data.districtCode]
+          scope.row.key++
+        })
+      }
+    },
     //自定义表头
     renderHeader(h) {
       return (

src/views/warehousing/cargoClearance/AddOrUpdate.vue

@@ -1,348 +1,360 @@
 <template>
   <div>
-    <div style="display: flex; justify-content: space-between">
-      <div style="display: flex; align-items: center">
-        <el-breadcrumb separator="/">
-          <el-breadcrumb-item><span style="font-weight: 700">通关</span></el-breadcrumb-item>
-          <el-breadcrumb-item><span style="font-weight: 700">通关详情页</span></el-breadcrumb-item>
-        </el-breadcrumb>
-        <el-button style="margin-left: 10px" size="mini" icon="el-icon-arrow-left" @click="goBack">返回列表</el-button>
-      </div>
-      <div v-if="showApproval == 0">
-        <el-button type="info" size="small" @click="addOrUpdateHandle(form, 'warehouse_status')"
-                   v-if="form.warehouseStatus > 3">查看接单审批
-        </el-button>
-        <el-button type="info" size="small" @click="addOrUpdateHand(form, 'warehouse_status')"
-                   v-if="form.warehouseStatus > 3 && approVal == true">接单审批
-        </el-button>
-        <el-button type="info" :disabled="form.warehouseStatus >= 4" size="small" @click="verifyForm"
-                   v-if="form.fBillstatus">接单请核
-        </el-button>
-        <el-button type="info" :disabled="browseStatus" size="small" @click="ordersRevoke"
-                   v-if="form.warehouseStatus == 6">撤销接单请核
-        </el-button>
-        <el-button type="info" :disabled="browseStatus" size="small" @click="revokeTwo('warehouse_status')"
-                   v-if="form.warehouseStatus == 4">撤销接单审批
+    <div class="customer-head">
+      <div class="customer-back">
+        <el-button
+            type="danger"
+            style="border: none;background: none;color: red"
+            @click="goBack"
+            icon="el-icon-arrow-left"
+        >返回列表
         </el-button>
       </div>
+      <div>
+        <div class="el-button--small-yh add-customer-btn" v-if="showApproval == 0" style="margin-right: 60px">
+          <el-button type="info" size="small" @click="addOrUpdateHandle(form, 'warehouse_status')"
+                     v-if="form.warehouseStatus > 3">查看接单审批
+          </el-button>
+          <el-button type="info" size="small" @click="addOrUpdateHand(form, 'warehouse_status')"
+                     v-if="form.warehouseStatus > 3 && approVal == true">接单审批
+          </el-button>
+          <el-button type="info" :disabled="form.warehouseStatus >= 4" size="small" @click="verifyForm"
+                     v-if="form.fBillstatus">接单请核
+          </el-button>
+          <el-button type="info" :disabled="browseStatus" size="small" @click="ordersRevoke"
+                     v-if="form.warehouseStatus == 6">撤销接单请核
+          </el-button>
+          <el-button type="info" :disabled="browseStatus" size="small" @click="revokeTwo('warehouse_status')"
+                     v-if="form.warehouseStatus == 4">撤销接单审批
+          </el-button>
+        </div>
+        <div class="el-button&#45;&#45;small-yh add-customer-btn">
+          <el-button
+              type="primary"
+              size="small"
+              @click="saveForm"
+          >保 存
+          </el-button>
+        </div>
+      </div>
     </div>
-    <br>
-    <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="客户" prop="fCorpid">
-            <el-select v-model="form.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 80%"
-                       @change="changefStltype" :disabled="detailList.length > 0">
-              <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName" :value="item.fId">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '1'">
-            <el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
-                       style="width: 80%">
-              <el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
-                         :value="item.dictValue" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '0'">
-            <el-select style="width: 80%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
+    <trade-card title="基础资料" style="margin-top: 50px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="客户" prop="fCorpid">
+              <el-select v-model="form.fCorpid" clearable filterable placeholder="请输入关键词" style="width: 80%"
+                         @change="changefStltype" :disabled="detailList.length > 0">
+                <el-option v-for="(item, index) in fMblnoOptions" :key="index.fId" :label="item.fName" :value="item.fId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '1'">
+              <el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
+                         style="width: 80%">
+                <el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
+                           :value="item.dictValue" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '0'">
+              <el-select style="width: 80%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
               contrOl ||
               browseStatus ||
               warehouseDrList.length > 0 ||
               warehouseCrList.length > 0
             ">
-              <el-option v-for="(item, index) in businessTypeOption" :key="index.dictValue" :label="item.dictLabel"
-                         :value="item.dictValue"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="提单号" prop="fMblno">
-            <el-input v-model="form.fMblno" style="width: 80%" placeholder="请输入提单号"
-                      :disabled="detailList.length != 0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="业务日期" prop="fBsdate">
-            <el-date-picker v-model="form.fBsdate" style="width: 80%" type="date" :disabled="browseStatus"
-                            value-format="timestamp" placeholder="业务日期" @change="changeDate" format="yyyy-MM-dd">
-            </el-date-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="业务时间" prop="fBstime">
-            <el-time-picker style="width: 80%" :disabled="browseStatus" v-model="form.fBstime" :picker-options="{
+                <el-option v-for="(item, index) in businessTypeOption" :key="index.dictValue" :label="item.dictLabel"
+                           :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="提单号" prop="fMblno">
+              <el-input v-model="form.fMblno" style="width: 80%" placeholder="请输入提单号"
+                        :disabled="detailList.length != 0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="业务日期" prop="fBsdate">
+              <el-date-picker v-model="form.fBsdate" style="width: 80%" type="date" :disabled="browseStatus"
+                              value-format="timestamp" placeholder="业务日期" @change="changeDate" format="yyyy-MM-dd">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="业务时间" prop="fBstime">
+              <el-time-picker style="width: 80%" :disabled="browseStatus" v-model="form.fBstime" :picker-options="{
               selectableRange: '00:00:00 - 23:59:59',
             }" value-format="timestamp" placeholder="任意时间点">
-            </el-time-picker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="仓管员" prop="fStorekeeper">
-            <el-select v-model="form.fStorekeeper" filterable clearable :disabled="browseStatus" style="width: 80%"
-                       placeholder="请输入模糊查找">
-              <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
-                         :value="item.userName"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="原仓库" prop="fInwarehouseid">
-            <el-select v-model="form.fInwarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
-                       style="width: 80%" placeholder="请选择" @change="fInwarehouseChange">
-              <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
-                         :value="item.fId"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="新仓库" prop="fWarehouseid">
-            <el-select v-model="form.fWarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
-                       style="width: 80%" placeholder="请选择">
-              <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
-                         :value="item.fId"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="单据编号" prop="fBillno">
-            <el-input v-model="form.fBillno" style="width: 80%" disabled placeholder="单据编号" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="计划通关件数" prop="fPlanqty">
-            <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数"
-                      :disabled="browseStatus || current !== before" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="计划通关净重(kg)" prop="fPlannetweight">
-            <el-input v-model="form.fPlannetweight" style="width: 80%" maxlength="16" v-input-limit="2"
-                      laceholder="计划净重" :disabled="browseStatus || current !== before" @change="tfNetweight">
-              <template slot="append">{{ tfNetweightnum }}吨</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="计划通关毛重(kg)" prop="fPlangrossweight">
-            <el-input v-model="form.fPlangrossweight" v-input-limit="2" style="width: 80%" laceholder="计划毛重"
-                      maxlength="16" :disabled="browseStatus || current !== before" @change="tfGrossweight">
-              <template slot="append">{{ tfGrossweightnum }}吨</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="detailsHidden2">
-        <el-col :span="8">
-          <el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '1'">
-            <el-select style="width: 80%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
+              </el-time-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="仓管员" prop="fStorekeeper">
+              <el-select v-model="form.fStorekeeper" filterable clearable :disabled="browseStatus" style="width: 80%"
+                         placeholder="请输入模糊查找">
+                <el-option v-for="(item, index) in userOptions" :key="index.userName" :label="item.nickName"
+                           :value="item.userName"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="原仓库" prop="fInwarehouseid">
+              <el-select v-model="form.fInwarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
+                         style="width: 80%" placeholder="请选择" @change="fInwarehouseChange">
+                <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+                           :value="item.fId"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="新仓库" prop="fWarehouseid">
+              <el-select v-model="form.fWarehouseid" filterable :disabled="browseStatus || detailList.length > 0"
+                         style="width: 80%" placeholder="请选择">
+                <el-option v-for="(item, index) in warehouseOptions" :key="index.fId" :label="item.fName"
+                           :value="item.fId"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="单据编号" prop="fBillno">
+              <el-input v-model="form.fBillno" style="width: 80%" disabled placeholder="单据编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="计划通关件数" prop="fPlanqty">
+              <el-input v-model.number="form.fPlanqty" style="width: 80%" maxlength="9" laceholder="计划件数"
+                        :disabled="browseStatus || current !== before" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划通关净重(kg)" prop="fPlannetweight">
+              <el-input v-model="form.fPlannetweight" style="width: 80%" maxlength="16" v-input-limit="2"
+                        laceholder="计划净重" :disabled="browseStatus || current !== before" @change="tfNetweight">
+                <template slot="append">{{ tfNetweightnum }}吨</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="计划通关毛重(kg)" prop="fPlangrossweight">
+              <el-input v-model="form.fPlangrossweight" v-input-limit="2" style="width: 80%" laceholder="计划毛重"
+                        maxlength="16" :disabled="browseStatus || current !== before" @change="tfGrossweight">
+                <template slot="append">{{ tfGrossweightnum }}吨</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="detailsHidden2">
+          <el-col :span="8">
+            <el-form-item label="作业类型" prop="fBusinessType" v-if="dataShowcar == '1'">
+              <el-select style="width: 80%" v-model="form.fBusinessType" filterable @change="educationChange" :disabled="
               contrOl ||
               browseStatus ||
               warehouseDrList.length > 0 ||
               warehouseCrList.length > 0
             ">
-              <el-option v-for="(item, index) in businessTypeOption" :key="index.dictValue" :label="item.dictLabel"
-                         :value="item.dictValue"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '0'">
-            <el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
-                       style="width: 80%">
-              <el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
-                         :value="item.dictValue" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="劳务公司" prop="fLabour">
-            <el-select style="width: 80%" v-model="form.fLabour" clearable filterable placeholder="请输入关键词"
-                       :disabled="contrOl || browseStatus">
-              <el-option v-for="(item, index) in fCompanyOptIons" :key="index.fId" :label="item.fName"
-                         :value="item.fId"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="车队" prop="fFleet" :rules="{
+                <el-option v-for="(item, index) in businessTypeOption" :key="index.dictValue" :label="item.dictLabel"
+                           :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="结算方式" prop="fStltypeid" v-if="dataShowcar == '0'">
+              <el-select v-model="form.fStltypeid" placeholder="请选择结算方式" clearable :disabled="browseStatus"
+                         style="width: 80%">
+                <el-option v-for="(item, index) in fStltypeOptions" :key="index.dictValue" :label="item.dictLabel"
+                           :value="item.dictValue" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="劳务公司" prop="fLabour">
+              <el-select style="width: 80%" v-model="form.fLabour" clearable filterable placeholder="请输入关键词"
+                         :disabled="contrOl || browseStatus">
+                <el-option v-for="(item, index) in fCompanyOptIons" :key="index.fId" :label="item.fName"
+                           :value="item.fId"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="车队" prop="fFleet" :rules="{
             required: isrequired === 1 ? true : false,
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-            <el-select style="width: 80%" v-model="form.fFleet" clearable filterable placeholder="请输入关键词"
-                       :disabled="contrOl || browseStatus">
-              <el-option v-for="(item, index) in fleetOptions" :key="index.fId" :label="item.fName" :value="item.fId">
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="detailsHidden2">
-        <el-col :span="8">
-          <el-form-item label="车号" prop="fTruckno" :rules="{
-            required: isrequired2 === 1 ? true : false,
-            message: '请选择',
-            trigger: ['blur', 'change'],
-          }">
-            <el-input v-model="form.fTruckno" style="width: 80%" :disabled="browseStatus" placeholder="车号" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="司机姓名" prop="fDriverName" :rules="{
+              <el-select style="width: 80%" v-model="form.fFleet" clearable filterable placeholder="请输入关键词"
+                         :disabled="contrOl || browseStatus">
+                <el-option v-for="(item, index) in fleetOptions" :key="index.fId" :label="item.fName" :value="item.fId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="detailsHidden2">
+          <el-col :span="8">
+            <el-form-item label="车号" prop="fTruckno" :rules="{
             required: isrequired2 === 1 ? true : false,
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-            <el-input v-model="form.fDriverName" style="width: 80%" :disabled="browseStatus" placeholder="司机姓名" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="司机电话" prop="fDriverTel" :rules="{
+              <el-input v-model="form.fTruckno" style="width: 80%" :disabled="browseStatus" placeholder="车号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="司机姓名" prop="fDriverName" :rules="{
             required: isrequired2 === 1 ? true : false,
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-            <el-input v-model="form.fDriverTel" style="width: 80%" :disabled="browseStatus" placeholder="司机电话" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8" v-if="detailsHidden2">
-          <el-form-item label="司机身份证" prop="fDriverIdCar" :rules="{
+              <el-input v-model="form.fDriverName" style="width: 80%" :disabled="browseStatus" placeholder="司机姓名" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="司机电话" prop="fDriverTel" :rules="{
             required: isrequired2 === 1 ? true : false,
             message: '请选择',
             trigger: ['blur', 'change'],
           }">
-            <el-input v-model="form.fDriverIdCar" style="width: 80%" :disabled="browseStatus" placeholder="司机身份证" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="原贸易方式" prop="fTrademodeid">
-            <el-select v-model="form.fTrademodeid" placeholder="请选择原贸易方式"
-                       :disabled="browseStatus || detailList.length > 0" clearable style="width: 80%">
-              <el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
-                         :value="dict.dictValue" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="新贸易方式" prop="fNewTrademodeid">
-            <el-select v-model="form.fNewTrademodeid" placeholder="请选择新贸易方式"
-                       :disabled="browseStatus || clearanceDisabled" clearable style="width: 80%">
-              <el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
-                         :value="dict.dictValue" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="备注" prop="remark">
-            <el-input style="width: 80%" v-model="form.remark" type="textarea" :disabled="browseStatus"
-                      placeholder="请输入内容" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item>
-            <div style="display: flex; align-items: center">
-              <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
-                <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
-                  <template slot-scope="scope">
-                    <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
-                      <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
-                                 :value="item.fId">
-                      </el-option>
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="fCntrcount" label="箱量" header-align="center" align="center">
-                  <template slot-scope="scope">
-                    <el-input placeholder="请输入箱量" v-model="scope.row.fCntrcount" size="mini">
-                    </el-input>
-                  </template>
-                </el-table-column>
-                <el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
-                               icon="el-icon-delete"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-tag class="tag-hover" @click="addRow"><i class="el-icon-plus"></i></el-tag>
-            </div>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item>
-            <el-button @click="
-              detailsHidden2
-                ? (detailsHidden2 = false)
-                : (detailsHidden2 = true)
-            " v-if="dataShowcar == '0'">{{ detailsHidden2 ? "隐藏" : "更多" }}
-            </el-button>
-            <el-button @click="
-              detailsHidden ? (detailsHidden = false) : (detailsHidden = true)
-            ">{{ detailsHidden ? "隐藏" : "展开" }}
-            </el-button>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <div v-if="detailsHidden">
-        <el-row style="margin-top: 30px">
-          <el-col :span="8">
-            <el-form-item label="仓库联系人" prop="fContacts">
-              <el-input v-model="form.fContacts" style="width: 80%" :disabled="browseStatus" placeholder="仓库联系人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="仓库电话" prop="fTel">
-              <el-input v-model="form.fTel" :disabled="browseStatus" style="width: 80%" placeholder="请输仓库入电话" />
+              <el-input v-model="form.fDriverTel" style="width: 80%" :disabled="browseStatus" placeholder="司机电话" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="制单人" prop="createBy">
-              <el-input disabled v-model="form.createBy" style="width: 80%" placeholder="制单人" />
+          <el-col :span="8" v-if="detailsHidden2">
+            <el-form-item label="司机身份证" prop="fDriverIdCar" :rules="{
+            required: isrequired2 === 1 ? true : false,
+            message: '请选择',
+            trigger: ['blur', 'change'],
+          }">
+              <el-input v-model="form.fDriverIdCar" style="width: 80%" :disabled="browseStatus" placeholder="司机身份证" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="制单部门" prop="fDeptid">
-              <el-select v-model="form.fDeptid" filterable disabled style="width: 80%" remote>
-                <el-option v-for="(item, index) in deptOptions" :key="index.deptId" :label="item.deptName"
-                           :value="item.deptId"></el-option>
+            <el-form-item label="原贸易方式" prop="fTrademodeid">
+              <el-select v-model="form.fTrademodeid" placeholder="请选择原贸易方式"
+                         :disabled="browseStatus || detailList.length > 0" clearable style="width: 80%">
+                <el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
+                           :value="dict.dictValue" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item disabled label="制单日期" prop="createTime">
-              <el-date-picker v-model="form.createTime" size="large" type="date" disabled style="width: 80%"
-                              value-format="timestamp" placeholder="制单日期">
-              </el-date-picker>
+            <el-form-item label="新贸易方式" prop="fNewTrademodeid">
+              <el-select v-model="form.fNewTrademodeid" placeholder="请选择新贸易方式"
+                         :disabled="browseStatus || clearanceDisabled" clearable style="width: 80%">
+                <el-option v-for="dict in fTrademodeidOptions" :key="dict.dictValue" :label="dict.dictLabel"
+                           :value="dict.dictValue" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="品名" prop="fProductName">
-              <el-input v-model="form.fProductName" style="width: 80%" disabled placeholder="品名" />
+          <el-col :span="16">
+            <el-form-item label="备注" prop="remark">
+              <el-input style="width: 100%" v-model="form.remark" type="textarea" :disabled="browseStatus"
+                        placeholder="请输入内容" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="品牌">
-              <el-input v-model="form.fMarks" style="width: 80%" disabled placeholder="品牌" />
+            <el-form-item>
+              <div style="display: flex; align-items: center">
+                <el-table :data="CntrTable" style="width: 80%" :header-cell-style="{ lineHeight: '16px' }">
+                  <el-table-column prop="fCntrid " label="箱型" header-align="center" align="center">
+                    <template slot-scope="scope">
+                      <el-select placeholder="请选择箱型" v-model="scope.row.fCntrid" size="mini">
+                        <el-option v-for="(item, index) in cntrList" :key="index.fId" :label="item.fName"
+                                   :value="item.fId">
+                        </el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="fCntrcount" label="箱量" header-align="center" align="center">
+                    <template slot-scope="scope">
+                      <el-input placeholder="请输入箱量" v-model="scope.row.fCntrcount" size="mini">
+                      </el-input>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="fCntrcount" label="操作" header-align="center" align="center" width="50">
+                    <template slot-scope="scope">
+                      <el-button size="mini" type="text" @click.native.prevent="deleteRow(scope.$index, CntrTable)"
+                                 icon="el-icon-delete"></el-button>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <el-tag class="tag-hover" @click="addRow"><i class="el-icon-plus"></i></el-tag>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item>
+              <el-button
+                  @click="detailsHidden2 ? (detailsHidden2 = false) : (detailsHidden2 = true)"
+                  v-if="dataShowcar == '0'">
+                {{ detailsHidden2 ? "隐藏" : "更多" }}
+              </el-button>
+              <el-button
+                  @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">
+                {{ detailsHidden ? "隐藏" : "展开" }}
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
-      </div>
-    </el-form>
+        <div v-if="detailsHidden">
+          <el-row style="margin-top: 30px">
+            <el-col :span="8">
+              <el-form-item label="仓库联系人" prop="fContacts">
+                <el-input v-model="form.fContacts" style="width: 80%" :disabled="browseStatus" placeholder="仓库联系人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="仓库电话" prop="fTel">
+                <el-input v-model="form.fTel" :disabled="browseStatus" style="width: 80%" placeholder="请输仓库入电话" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="制单人" prop="createBy">
+                <el-input disabled v-model="form.createBy" style="width: 80%" placeholder="制单人" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="制单部门" prop="fDeptid">
+                <el-select v-model="form.fDeptid" filterable disabled style="width: 80%" remote>
+                  <el-option v-for="(item, index) in deptOptions" :key="index.deptId" :label="item.deptName"
+                             :value="item.deptId"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item disabled label="制单日期" prop="createTime">
+                <el-date-picker v-model="form.createTime" size="large" type="date" disabled style="width: 80%"
+                                value-format="timestamp" placeholder="制单日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="品名" prop="fProductName">
+                <el-input v-model="form.fProductName" style="width: 80%" disabled placeholder="品名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="品牌">
+                <el-input v-model="form.fMarks" style="width: 80%" disabled placeholder="品牌" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </el-form>
+    </trade-card>
     <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px" v-dialogDrag :close-on-click-modal="false">
       <template slot="title">
         <div class="avue-crud__dialog__header">
@@ -702,328 +714,6 @@
         <el-button @click="whgenlegVisible = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="print_zyd" width="70%" :close-on-click-modal="false" :modal="false">
-      <div id="print_area1" class="print-div">
-        <div class="print-title" style="
-            display: flex;
-            justify-content: center;
-            font-size: 24px;
-            margin-bottom: 5px;
-          ">
-          {{ company }}作业单
-        </div>
-        <div style="
-            display: flex;
-            justify-content: center;
-            font-size: 18px;
-            margin-bottom: 5px;
-          "></div>
-        <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
-            <tr>
-              <td>作业类型</td>
-              <td colspan="2">
-                {{ form.fBusinessType | fBusinessTypeFormat }}
-              </td>
-              <td>入库时间</td>
-              <td colspan="2"></td>
-            </tr>
-            <tr>
-              <td>车号</td>
-              <td>物品名称</td>
-              <td>提单号</td>
-              <td>品牌/规格/产地</td>
-              <td>净重(KG)</td>
-              <td>件数/规格</td>
-            </tr>
-            <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fTruckno }}</td>
-              <td>{{ item.fGoodsids }}</td>
-              <td>{{ item.fMblno }}</td>
-              <td>
-                {{ item.fBusinessType | fStorageFormat }}/{{ item.fMarks }}
-              </td>
-              <td>{{ item.fNetweight }}</td>
-              <td>{{ item.fQty }}/{{ item.fPackagespecs }}</td>
-            </tr>
-            <tr>
-              <td>备注</td>
-              <td colspan="5"></td>
-            </tr>
-            <tr v-for="(item, index) in Collectionoptionss" :key="index">
-              <td>收费</td>
-              <td colspan="2">{{ item.fFeeids }}</td>
-              <td colspan="3">{{ item.fAmount }} 元</td>
-            </tr>
-            <tr>
-              <td>司机签字</td>
-              <td></td>
-              <td>电话</td>
-              <td>{{ fDriverTel }}</td>
-              <td colspan="2" rowspan="2">
-                确认货物数量无误，包装于货物完好！<br />出库盖好篷布，如有违背责任自负<br />装卸工是否收小费
-              </td>
-            </tr>
-            <tr>
-              <td>制表</td>
-              <td>{{ form.createBy }}</td>
-              <td>机械/人工</td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>地址</td>
-              <td colspan="2">{{ stockaddr }}</td>
-              <td>电话</td>
-              <td colspan="2">{{ form.fTel }}</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-      <span lot="footer" class="dialog-footer">
-        <el-button type="primary" size="mini" :disabled="browseStatus" @click="
-  print_zyd = false;
-addprint('zyd');
-        ">打印
-        </el-button>
-        <el-button @click="print_zyd = false" size="mini">取消 </el-button>
-      </span>
-    </el-dialog>
-    <el-dialog :visible.sync="print_rkd" width="70%" :close-on-click-modal="false" :modal="false">
-      <div id="print_area1" class="print-div">
-        <div class="print-title" style="
-            display: flex;
-            justify-content: center;
-            font-size: 24px;
-            margin-bottom: 5px;
-          ">
-          {{ company }}进仓单
-        </div>
-        <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
-            <tr>
-              <td>客户</td>
-              <td>{{ form.fCorpidName }}</td>
-              <td>仓库</td>
-              <td>{{ form.fWarehouseids }}</td>
-              <td>地址</td>
-              <td colspan="2">{{ stockaddr }}</td>
-            </tr>
-            <tr>
-              <td>保管方</td>
-              <td width="200">{{ company }}</td>
-              <td>联系人</td>
-              <td>{{ form.fContacts }}</td>
-              <td>电话</td>
-              <td colspan="2">{{ form.fTel }}</td>
-            </tr>
-            <tr>
-              <td>提单号</td>
-              <td>品名</td>
-              <td>箱型</td>
-              <td>品牌</td>
-              <td>件数</td>
-              <td>重量</td>
-              <td>包装规格</td>
-            </tr>
-            <tr>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-              <td></td>
-            </tr>
-            <tr>
-              <td>序号</td>
-              <td>入货日期</td>
-              <td>箱量(20GP)</td>
-              <td>重量</td>
-              <td>件数</td>
-              <td>入库重量</td>
-              <td>入库件数</td>
-            </tr>
-            <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ index + 1 }}</td>
-              <td>{{ item.fBsdate }}</td>
-              <td>{{ item.fCntqty }}</td>
-              <td v-if="item.fGrossweight">
-                {{ (item.fGrossweight / 1000).toFixed(2) }}
-              </td>
-              <td v-else></td>
-              <td>{{ item.fPlanqty }}</td>
-              <td v-if="item.fNetweight">
-                {{ (item.fNetweight / 1000).toFixed(2) }}
-              </td>
-              <td v-else></td>
-              <td>{{ item.fQty }}</td>
-            </tr>
-            <tr>
-              <td colspan="2">合计</td>
-              <td>{{ allfCntqty }}</td>
-              <td>{{ (allfGrossweight / 1000).toFixed(2) }}</td>
-              <td>{{ allfPlanqty }}</td>
-              <td>{{ (allfNetweight / 1000).toFixed(2) }}</td>
-              <td>{{ allfQty }}</td>
-            </tr>
-            <tr>
-              <td>备注</td>
-              <td colspan="6"></td>
-            </tr>
-            <tr>
-              <td colspan="7">
-                本进仓单经仓管员签字并经保管方盖章后即专项作为货物所有人的货权证明，本单据不得转让。
-              </td>
-            </tr>
-          </table>
-        </div>
-        <div style="display: flex; justify-content: space-between; font-size: 12px">
-          <div>开单员：</div>
-          <div style="width: 150px">仓管员：</div>
-        </div>
-        <div style="display: flex; justify-content: space-between; font-size: 12px">
-          <div>开单时间：</div>
-          <div style="width: 150px">(盖章)</div>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" :disabled="browseStatus" @click="
-  print_rkd = false;
-addprint();
-        ">打印
-        </el-button>
-        <el-button @click="print_rkd = false">取消 </el-button>
-      </span>
-    </el-dialog>
-    <el-dialog :visible.sync="print_shd" width="70%" :close-on-click-modal="false" :modal="false">
-      <div id="print_area1" class="print-div">
-        <div class="print-title" style="
-            display: flex;
-            justify-content: center;
-            font-size: 24px;
-            margin-bottom: 5px;
-          ">
-          {{ company }}收货单
-        </div>
-        <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
-            <tr>
-              <td>车号</td>
-              <td>{{ fTruckno }}</td>
-              <td>日期</td>
-              <td>{{ fBsdate }}</td>
-            </tr>
-            <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>货物品名</td>
-              <td>{{ item.fGoodsids }}</td>
-              <td>件数</td>
-              <td>{{ item.fQty }}件</td>
-            </tr>
-            <tr>
-              <td>备注</td>
-              <td colspan="3"></td>
-            </tr>
-            <tr>
-              <td>司机签字</td>
-              <td></td>
-              <td>司机电话</td>
-              <td>{{ fDriverTel }}</td>
-            </tr>
-            <tr>
-              <td>制单人</td>
-              <td>{{ form.createBy }}</td>
-              <td>收货人</td>
-              <td>{{ form.fContacts }}</td>
-            </tr>
-            <tr>
-              <td>地址</td>
-              <td>{{ stockaddr }}</td>
-              <td>电话</td>
-              <td>{{ form.fTel }}</td>
-            </tr>
-          </table>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" :disabled="browseStatus" @click="
-  addprint();
-print_shd = false;
-        ">打印
-        </el-button>
-        <el-button @click="print_shd = false">取消 </el-button>
-      </span>
-    </el-dialog>
-    <el-dialog :visible.sync="print_ykd" width="70%" :close-on-click-modal="false" :modal="false">
-      <div id="print_area1" class="print-div">
-        <div class="print-title" style="
-            display: flex;
-            justify-content: center;
-            font-size: 24px;
-            margin-bottom: 5px;
-          ">
-          {{ company }}
-        </div>
-        <div style="
-            display: flex;
-            justify-content: center;
-            font-size: 18px;
-            margin-bottom: 5px;
-          ">
-          <div>移&nbsp;库&nbsp;单</div>
-        </div>
-        <div style="
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 5px;
-          " class="print_form">
-          <div>
-            <div>业务编号：{{ form.fCustomno }}</div>
-            <div>通关日期：{{ form.fChargedate }}</div>
-          </div>
-          <div>
-            <div>客户名称：{{ form.fCorpidName }}</div>
-            <div>提单号：{{ form.fMblno }}</div>
-          </div>
-          <div>
-            <div>存放地址：{{ stockName }}</div>
-            <div>通关：</div>
-          </div>
-        </div>
-        <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
-            <tr>
-              <td>箱号</td>
-              <td>现存库区</td>
-              <td>件数</td>
-              <td>毛重</td>
-              <td>净重</td>
-              <td>移入库区</td>
-            </tr>
-            <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fCntrno }}</td>
-              <td>{{ item.fOrgwarehouseInformation }}</td>
-              <td>{{ item.fQty }}</td>
-              <td>{{ item.fGrossweight }}</td>
-              <td>{{ item.fNetweight }}</td>
-
-              <td>{{ item.fWarehouseInformation }}</td>
-            </tr>
-          </table>
-        </div>
-        <div style="display: flex; justify-content: space-between; font-size: 12px">
-          <div>库管：{{ form.fContacts }}</div>
-          <div style="width: 100px">叉车：</div>
-        </div>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" :disabled="browseStatus" @click="
-  addprint();
-print_ykd = false;
-        ">打印
-        </el-button>
-        <el-button @click="print_ykd = false">取消 </el-button>
-      </span>
-    </el-dialog>
     <!-- 选择作业费协议数据 -->
     <el-dialog v-dialogDrag title="作业费协议" :close-on-click-modal="false" :modal="false"
                style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important" :visible.sync="warehousingagreements" width="70%">
@@ -1088,8 +778,7 @@ Navigation = false;
     <div style="display: flex; justify-content: flex-end; margin-top: 10px">
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData">
-      </approval-comments>
+      <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
       <el-button type="primary" :disabled="approvalStatus" v-if="form.fBillstatus > 3"
                  @click="addOrUpdateHandle(form, 'f_billstatus')">查看审批</el-button>
       <el-button type="primary" v-if="approVal === true" @click="addOrUpdateHand(form, 'f_billstatus')">审批</el-button>
@@ -1632,7 +1321,7 @@ export default {
       showSetting2: false,
       unloadModes: [],
       detailsHidden2: true,
-      dataShowcar: null,
+      dataShowcar: 0,
       tfNetweightnum: 0,
       tfGrossweightnum: 0,
       showApproval: null,

src/views/warehousing/cargoClearance/index.vue

@@ -1280,7 +1280,8 @@ export default {
     },
     showAddOrUpdate(data) {
       if (data) {
-        this.getList();
+        //正式后要调用查询接口
+        // this.getList();
         this.pageShow = true;
         this.pageShow2 = false;
       }