Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/api/kaihe/domesticTrade/orderInformation.js

@@ -106,10 +106,19 @@ export function getFName(data) {
     data: data
   })
 }
-//获取审批人
+//费用请核
 export function getfee(data) {
   return request({
-    url: '/warehouse/paths/projectEndQueryPendingVal',
+    url: '/khwarehouse/warehousebills/ruoYiSubmitMessage',
+    method: 'post',
+    data: data
+  })
+}
+//获取审批人
+
+export function getName(data) {
+  return request({
+    url: 'warehouse/paths/projectEndQueryPendingVal',
     method: 'post',
     data: data
   })

src/views/finance/charge/index.vue

@@ -306,7 +306,7 @@
             <span v-if="item.label == 'createBy'">{{scope.row.createBy}}</span>
             <span v-if="item.label == 'fBillno'">{{scope.row.fBillno}}</span>
             <span v-if="item.label == 'fCtrlcorpid'">{{scope.row.fCtrlcorpid}}</span>
-            <span v-if="item.label == 'createTime'">{{(scope.row.createTime).slice(0,10)}}</span>
+            <span v-if="item.label == 'createTime'">{{scope.row.createTime?scope.row.createTime.slice(0,10):''}}</span>
             <span v-if="item.label == 'fAccbilldate'">{{scope.row.fAccbilldate}}</span>
             <span v-if="item.label == 'tMblno'">{{scope.row.tMblno}}</span>
             <span v-if="item.label == 'chargingMethod'">{{scope.row.chargingMethod}}</span>
@@ -407,7 +407,7 @@
         ref="ruless"
         :inline="true"
         v-show="showSearch"
-        label-width="68px"
+        label-width="78px"
       >
         <el-form-item label="货权方" prop="fCtrlcorpid">
           <el-input
@@ -420,7 +420,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="结算单位" label-width="78px" prop="fCorpid">
+        <el-form-item label="结算单位" prop="fCorpid">
           <el-select
             v-model="queryParams.fCorpid"
             filterable
@@ -441,7 +441,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="收费日期" label-width="78px" prop="fAccbilldate">
+        <el-form-item label="收费日期" prop="fAccbilldate">
           <el-date-picker
             clearable
             size="small"
@@ -523,23 +523,23 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="业务类型" prop="fSystemType">
-          <el-select
-            v-model="queryParams.fSystemType"
-            placeholder="请选择业务类型"
-            size="small"
-            disabled
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in typeoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="业务类型" prop="fSystemType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.fSystemType"-->
+<!--            placeholder="请选择业务类型"-->
+<!--            size="small"-->
+<!--            disabled-->
+<!--            style="width: 200px"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item in typeoptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
       <div style="width: 100%; display: flex; justify-content: space-between">
         <div style="display: flex">
@@ -776,7 +776,9 @@
           label-width="80px"
           style="display: flex; flex-wrap: wrap"
         >
-          <el-form-item label="货权方" prop="fCtrlcorpid">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="货权方" prop="fCtrlcorpid">
             <!--            <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>-->
             <el-select
               v-model="queryParams.fCorpid"
@@ -784,7 +786,7 @@
               remote
               clearable
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请选择货权方"
@@ -797,14 +799,16 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="结算单位" prop="fToCorpid">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="结算单位" prop="fToCorpid">
             <el-select
               v-model="queryParameter.fToCorpid"
               filterable
               remote
               clearable
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               :disabled="doNot"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
@@ -818,30 +822,38 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="提单号" prop="tMblno">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="提单号" prop="tMblno">
             <el-input
               v-model="queryParameter.fMblno"
               placeholder="请输入提单号"
-              style="width: 200px"
+              style="width: 160px"
               size="small"
             />
           </el-form-item>
-          <el-form-item label="对账单号" prop="fStatementNo">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="对账单号" prop="fStatementNo">
             <el-input
               v-model="queryParameter.fStatementNo"
               placeholder="请输入提单号"
               size="small"
-              style="width: 200px"
+              style="width: 160px"
             />
           </el-form-item>
-          <el-form-item label="费用名称" prop="fFeeid">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="费用名称" prop="fFeeid">
             <template>
               <el-select
                 v-model="queryParameter.fFeeid"
                 filterable
                 remote
                 size="small"
-                style="width: 200px"
+                style="width: 160px"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
                 multiple
@@ -856,11 +868,13 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
             <el-select
               v-model="queryParameter.fBilltype"
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               @change="changefBilltype"
               placeholder="请选择仓储业务"
             >
@@ -869,7 +883,9 @@
               <el-option label="货权转移" value="HQZY"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
             label="作业类型"
             prop="fBusinessType"
             v-if="typevalue == 1 || typevalue == 3"
@@ -879,7 +895,7 @@
               filterable
               remote
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               placeholder="作业类型"
               multiple
             >
@@ -892,24 +908,31 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="审核日期"
-            prop="timeExamine"
-            v-if="typevalue == 1 || typevalue == 3"
-          >
-            <el-date-picker
-              size="small"
-              style="width: 240px"
-              v-model="queryParameter.timeExamine"
-              type="daterange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-              :default-time="['00:00:00', '23:59:59']"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
+            </el-col>
+            <el-col :span="6" style="width: 240px"></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item
+                label="审核日期"
+                prop="timeExamine"
+                v-if="typevalue == 1 || typevalue == 3"
+              >
+                <el-date-picker
+                  size="small"
+                  style="width: 240px"
+                  v-model="queryParameter.timeExamine"
+                  type="daterange"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  :default-time="['00:00:00', '23:59:59']"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item
             label="出入库日期"
             label-width="85px"
             prop="fAccbilldate"
@@ -927,7 +950,9 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item>
+            </el-col>
+            <el-col :span="8" style="width: 320px">
+              <el-form-item>
             <el-button
               type="cyan"
               icon="el-icon-search"
@@ -939,6 +964,8 @@
             >重置</el-button
             >
           </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <el-table
           v-loading="loading"
@@ -955,10 +982,10 @@
             width="55"
             align="center"
           />
-          <el-table-column label="货权方" align="center" prop="fName" />
+          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip/>
           <el-table-column label="提单号" align="center" prop="fMblno" />
-          <el-table-column label="品名" align="center" prop="fProductName" />
-          <el-table-column label="业务日期" align="center">
+          <el-table-column v-if="typevalue == 1 || typevalue == 2" label="品名" align="center" prop="fProductName" />
+          <el-table-column v-if="typevalue == 1 || typevalue == 2" label="业务日期" align="center">
             <template slot-scope="scope" v-if="scope.row.fBsdate">
               <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
             </template>
@@ -975,8 +1002,8 @@
             align="center"
             prop="fBusinessType"
           />
-          <el-table-column label="审核日期" align="center" prop="fReviewDate" />
-          <el-table-column label="费用名称" align="center" prop="fFeeName" />
+          <el-table-column label="审核日期" align="center" prop="fReviewDate" width="100px"/>
+          <el-table-column label="费用名称" align="center" prop="fFeeName" width="100px" show-overflow-tooltip/>
           <el-table-column label="金额" align="center" prop="fAmtdr" />
           <el-table-column
             label="本次金额"

src/views/finance/contrast/index.vue

@@ -465,23 +465,23 @@
             :disabled="notChange"
           />
         </el-form-item>
-        <el-form-item label="业务类型" prop="fSystemType">
-          <el-select
-            v-model="queryParams.fSystemType"
-            placeholder="请选择业务类型"
-            size="small"
-            disabled
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in typeoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="业务类型" prop="fSystemType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.fSystemType"-->
+<!--            placeholder="请选择业务类型"-->
+<!--            size="small"-->
+<!--            disabled-->
+<!--            style="width: 200px"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item in typeoptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <div style="width: 100%; display: flex; justify-content: space-between">
           <div style="display: flex">
             <el-button icon="el-icon-arrow-left" type="danger" v-if="cancelButton === true" size="mini" @click="cancel"
@@ -736,7 +736,7 @@
         v-dialogDrag
         :fullscreen="dialogFull"
         :close-on-click-modal="false"
-        width="70%"
+        width="78%"
         :title="title"
         :visible.sync="innerVisible"
         append-to-body
@@ -774,17 +774,19 @@
           :model="TWareHouseFees"
           ref="feeListRules"
           :rules="feeListRules"
-          label-width="80px"
+          label-width="78px"
           :inline="true"
         >
-          <el-form-item label="货权方" prop="fCorpid">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="货权方" prop="fCorpid">
             <el-select
               v-model="TWareHouseFees.fCorpid"
               filterable
               remote
               clearable
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请输入客户名称"
@@ -797,8 +799,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="结算单位" prop="fToCorpid">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="结算单位" prop="fToCorpid">
             <el-select
               v-model="TWareHouseFees.fToCorpid"
               placeholder="请选择结算单位"
@@ -806,7 +809,7 @@
               filterable
               remote
               clearable
-              style="width: 200px"
+              style="width: 160px"
               size="small"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
@@ -819,42 +822,48 @@
               ></el-option>
             </el-select>
           </el-form-item>
-
-          <el-form-item label="提单号" prop="fMblno">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="提单号" prop="fMblno">
             <el-input
               clearable
               v-model="TWareHouseFees.fMblno"
               placeholder="请输入提单号"
-              style="width: 200px"
+              style="width: 160px"
               size="small"
             />
           </el-form-item>
-          <el-form-item label="应收应付" prop="fDc">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="应收应付" prop="fDc">
             <el-col :span="8">
               <el-select
                 v-model="TWareHouseFees.fDc"
                 size="small"
-                style="width: 200px"
+                style="width: 160px"
               >
                 <el-option label="应收" value="D" />
                 <el-option label="应付" value="C" />
               </el-select>
             </el-col>
           </el-form-item>
-          <el-form-item label="是否对账" prop="fReconciliation">
-            <el-col :span="8">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="是否对账" prop="fReconciliation">
               <el-select
                 v-model="TWareHouseFees.fReconciliation"
                 size="small"
-                style="width: 200px"
+                style="width: 160px"
               >
                 <el-option label="是" value="1" />
                 <el-option label="否" value="0" />
               </el-select>
-            </el-col>
           </el-form-item>
-
-          <el-form-item label="费用名称" prop="fFeeid">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="费用名称" prop="fFeeid">
             <template>
               <el-select
                 v-model="TWareHouseFees.fFeeid"
@@ -862,7 +871,7 @@
                 :disabled="browseStatus"
                 remote
                 size="small"
-                style="width: 200px"
+                style="width: 160px"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
                 multiple
@@ -877,11 +886,13 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
             <el-select
               v-model="TWareHouseFees.fBilltype"
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               @change="changefBilltype"
               placeholder="请选择仓储业务"
             >
@@ -890,14 +901,16 @@
               <el-option label="货权转移" value="HQZY"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="作业类型" prop="fBusinessType">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="作业类型" prop="fBusinessType">
             <el-select
               v-model="TWareHouseFees.fBusinessType"
               filterable
               :disabled="browseStatus"
               remote
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               placeholder="作业类型"
               multiple
             >
@@ -910,7 +923,11 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item
             label="审核日期"
             prop="timeExamine"
             v-if="typevalue == 1 || typevalue == 3"
@@ -927,7 +944,9 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item
+            </el-col>
+            <el-col :span="8">
+              <el-form-item
             label="对账日期"
             label-width="85px"
             prop="timeReconci"
@@ -944,7 +963,9 @@
               :default-time="['00:00:00', '23:59:59']"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item>
             <!-- <el-button class="btnColor" type="info" size="mini">导入</el-button> -->
             <el-button type="cyan" size="mini" @click="searchFee(typevalue)"
             >搜索</el-button
@@ -953,6 +974,8 @@
             >重置</el-button
             >
           </el-form-item>
+            </el-col>
+          </el-row>
 
           <el-table
             v-loading="loading"
@@ -970,22 +993,24 @@
               align="center"
               prop="fName"
               show-overflow-tooltip
+              width="200px"
             />
             <el-table-column
               label="结算单位"
               align="center"
               prop="fFeesName"
+              width="200px"
               show-overflow-tooltip
             />
             <!-- <el-table-column label="账单日期" align="center" prop="fAccbilldate"/> -->
             <el-table-column label="提单号" align="center" prop="fMblno" />
-            <el-table-column label="品名" align="center" prop="fProductName" />
-            <el-table-column label="业务日期" align="center">
+            <el-table-column v-if="typevalue == 1 || typevalue == 2" label="品名" align="center" prop="fProductName" />
+            <el-table-column v-if="typevalue == 1 || typevalue == 2" label="业务日期" align="center">
               <template slot-scope="scope" v-if="scope.row.fBsdate">
                 <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="业务类型" align="center" prop="fBilltype">
+            <el-table-column v-if="typevalue == 1 || typevalue == 2" label="业务类型" align="center" prop="fBilltype">
               <template slot-scope="scope">
                 <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
                 <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>

src/views/finance/payment/index.vue

@@ -411,7 +411,7 @@
         ref="ruless"
         :inline="true"
         v-show="showSearch"
-        label-width="68px"
+        label-width="78px"
       >
         <el-form-item label="货权方" prop="fCtrlcorpid">
           <el-input
@@ -424,7 +424,7 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="结算单位" label-width="78px" prop="fCorpid">
+        <el-form-item label="结算单位" prop="fCorpid">
           <el-select
             v-model="queryParams.fCorpid"
             filterable
@@ -445,7 +445,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="付费日期" label-width="78px" prop="fAccbilldate">
+        <el-form-item label="付费日期" prop="fAccbilldate">
           <el-date-picker
             clearable
             size="small"
@@ -527,23 +527,23 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="业务类型" prop="fSystemType">
-          <el-select
-            v-model="queryParams.fSystemType"
-            placeholder="请选择业务类型"
-            size="small"
-            disabled
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in typeoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="业务类型" prop="fSystemType">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.fSystemType"-->
+<!--            placeholder="请选择业务类型"-->
+<!--            size="small"-->
+<!--            disabled-->
+<!--            style="width: 200px"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item in typeoptions"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
       <div style="width: 100%; display: flex; justify-content: space-between">
         <div style="display: flex">
@@ -810,7 +810,9 @@
           label-width="80px"
           style="display: flex; flex-wrap: wrap"
         >
-          <el-form-item label="货权方" prop="fCtrlcorpid">
+          <el-row>
+            <el-col :span="6">
+               <el-form-item label="货权方" prop="fCtrlcorpid">
             <!--            <el-input v-model="queryParameter.fCorpid" placeholder="请输入货权方" style="width: 200px;"/>-->
             <el-select
               v-model="queryParams.fCorpid"
@@ -818,7 +820,7 @@
               remote
               clearable
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请选择货权方"
@@ -831,7 +833,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="结算单位" prop="fToCorpid">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="结算单位" prop="fToCorpid">
             <el-select
               v-model="queryParameter.fToCorpid"
               filterable
@@ -839,7 +843,7 @@
               clearable
               size="small"
               :disabled="doNot"
-              style="width: 200px"
+              style="width: 160px"
               @keyup.enter.native="handleQuery"
               :remote-method="corpsRemoteMethod"
               placeholder="请输入结算单位"
@@ -852,30 +856,38 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="提单号" prop="tMblno">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="提单号" prop="tMblno">
             <el-input
               v-model="queryParameter.fMblno"
               placeholder="请输入提单号"
-              style="width: 200px"
+              style="width: 160px"
               size="small"
             />
           </el-form-item>
-          <el-form-item label="对账单号" prop="fStatementNo">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="对账单号" prop="fStatementNo">
             <el-input
               v-model="queryParameter.fStatementNo"
               placeholder="请输入提单号"
               size="small"
-              style="width: 200px"
+              style="width: 160px"
             />
           </el-form-item>
-          <el-form-item label="费用名称" prop="fFeeid">
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="费用名称" prop="fFeeid">
             <template>
               <el-select
                 v-model="queryParameter.fFeeid"
                 filterable
                 remote
                 size="small"
-                style="width: 200px"
+                style="width: 160px"
                 :remote-method="fWRemoteMethod"
                 placeholder="费用名称"
                 multiple
@@ -890,11 +902,13 @@
               </el-select>
             </template>
           </el-form-item>
-          <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
+            </el-col>
+            <el-col :span="6">
+               <el-form-item label="仓储业务" prop="fFeeid" v-if="typevalue == 1 || typevalue == 3">
             <el-select
               v-model="queryParameter.fBilltype"
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               @change="changefBilltype"
               placeholder="请选择仓储业务"
             >
@@ -903,13 +917,15 @@
               <el-option label="货权转移" value="HQZY"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="作业类型" prop="fBusinessType">
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="作业类型" prop="fBusinessType">
             <el-select
               v-model="queryParameter.fBusinessType"
               filterable
               remote
               size="small"
-              style="width: 200px"
+              style="width: 160px"
               placeholder="作业类型"
               multiple
             >
@@ -922,24 +938,31 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item
-            label="审核日期"
-            prop="timeExamine"
-            v-if="typevalue == 1 || typevalue == 3"
-          >
-            <el-date-picker
-              size="small"
-              style="width: 240px"
-              v-model="queryParameter.timeExamine"
-              type="daterange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-              :default-time="['00:00:00', '23:59:59']"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item
+            </el-col>
+            <el-col :span="6" style="width: 240px"></el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item
+                label="审核日期"
+                prop="timeExamine"
+                v-if="typevalue == 1 || typevalue == 3"
+              >
+                <el-date-picker
+                  size="small"
+                  style="width: 240px"
+                  v-model="queryParameter.timeExamine"
+                  type="daterange"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  :default-time="['00:00:00', '23:59:59']"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item
             label="出入库日期"
             label-width="85px"
             prop="fAccbilldate"
@@ -957,7 +980,9 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item>
+            </el-col>
+            <el-col :span="8" style="width: 320px">
+              <el-form-item>
             <el-button
               type="cyan"
               icon="el-icon-search"
@@ -969,6 +994,11 @@
             >重置</el-button
             >
           </el-form-item>
+            </el-col>
+
+          </el-row>
+
+
         </el-form>
         <el-table
           v-loading="loading"
@@ -985,10 +1015,10 @@
             width="55"
             align="center"
           />
-          <el-table-column label="货权方" align="center" prop="fName" />
+          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip/>
           <el-table-column label="提单号" align="center" prop="fMblno" />
-          <el-table-column label="品名" align="center" prop="fProductName" />
-          <el-table-column label="业务日期" align="center">
+          <el-table-column v-if="typevalue == 1 || typevalue == 2" label="品名" align="center" prop="fProductName" />
+          <el-table-column v-if="typevalue == 1 || typevalue == 2" label="业务日期" align="center">
             <template slot-scope="scope" v-if="scope.row.fBsdate">
               <span>{{ scope.row.fBsdate.slice(0, 10) }}</span>
             </template>
@@ -1005,8 +1035,8 @@
             align="center"
             prop="fBusinessType"
           />
-          <el-table-column label="审核日期" align="center" prop="fReviewDate" />
-          <el-table-column label="费用名称" align="center" prop="fFeeName" />
+          <el-table-column label="审核日期" align="center" prop="fReviewDate" width="100px"/>
+          <el-table-column label="费用名称" align="center" prop="fFeeName" width="100px" show-overflow-tooltip/>
           <el-table-column label="金额" align="center" prop="fAmtdr" />
           <el-table-column
             label="本次金额"

src/views/jiGang/index.vue

@@ -458,7 +458,7 @@
               filterable
               :disabled="disabled"
               remote
-              :remote-method="corpsRemoteMethod"
+              :remote-method="corpsRemote"
               placeholder="客户名称"
             >
               <el-option
@@ -707,6 +707,15 @@ export default {
       listCorps(queryParams).then((response) => {
         console.log(response)
         this.fMblnoOptions = response.rows
+      })
+    },
+    corpsRemote(name) {
+      if (name == null || name === '') {
+        return false
+      }
+      let queryParams = {pageNum: 1, fName: name, type: 2}
+      listCorps(queryParams).then((response) => {
+        console.log(response)
         this.blnoOptions = response.rows
       })
     },

src/views/kaihe/domesticTrade/orderInformation/index.vue

@@ -515,7 +515,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择业务类型"
                     >
                       <el-option
                         v-for="dict in businessTypeOptions"
@@ -539,7 +539,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择客户名称"
                     >
                       <el-option
                         v-for="item in nameOptions"
@@ -563,7 +563,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId !== 0"
-                      placeholder="费用名称"
+                      placeholder="请选择费用名称"
                     >
                       <el-option
                         v-for="(dict, index) in fDNameOptions"
@@ -832,7 +832,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择业务类型"
                     >
                       <el-option
                         v-for="dict in businessTypeOptions"
@@ -856,7 +856,7 @@
                       filterable
                       remote
                       :disabled="modify || scope.row.fSrcTypeId != 0"
-                      placeholder="客户名称"
+                      placeholder="请选择客户名称"
                     >
                       <el-option
                         v-for="item in nameOptions"
@@ -880,7 +880,7 @@
                 filterable
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
                 remote
-                placeholder="费用名称"
+                placeholder="请选择费用名称"
               >
                 <el-option
                   v-for="(dict, index) in fCNameOptions"
@@ -905,7 +905,7 @@
                 remote
                 @change="changeFeeUnit(scope.row)"
                 :disabled="modify || scope.row.fSrcTypeId !== 0"
-                placeholder="计价单位"
+                placeholder="请选择计价单位"
               >
                 <el-option
                   v-for="(dict, index) in jFeetunitOptions"
@@ -1199,7 +1199,7 @@
 </template>
 
 <script>
-import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName,getFName,getfee} from '@/api/kaihe/domesticTrade/orderInformation'
+import { listCorps, addmodify, getCntr, postApproval, listFees,getGoodName,getFName,getfee,getName} from '@/api/kaihe/domesticTrade/orderInformation'
 import Global from '@/layout/components/global'
 import { getToken } from '@/utils/auth'
 import Cookies from 'js-cookie'
@@ -1366,7 +1366,7 @@ export default {
           actId:460,
           id:this.form.fId
         }
-        getfee(data).then(response=>{
+        getName(data).then(response=>{
           if(response.data.length != 0){
             this.before = response.data[0].userName
           }

src/views/reportManagement/singleTicket/index.vue

@@ -182,6 +182,26 @@ export default {
       listpayable(this.query).then(res=>{
         this.costData = res.data.feeList
         this.tableData = res.data.singleAnalysis
+        for (let item in this.tableData){
+          if (this.tableData[item].inQty == 0){
+            this.tableData[item].inQty = ''
+          }
+          if (this.tableData[item].inGrossweight == 0){
+            this.tableData[item].inGrossweight = ''
+          }
+          if (this.tableData[item].outGrossweight == 0){
+            this.tableData[item].outGrossweight = ''
+          }
+          if (this.tableData[item].fQtyblc == 0){
+            this.tableData[item].fQtyblc = ''
+          }
+          if (this.tableData[item].fGrossweightblc == 0){
+            this.tableData[item].fGrossweightblc = ''
+          }
+          if (this.tableData[item].outQty == 0){
+            this.tableData[item].outQty = ''
+          }
+        }
         this.formInline.goodsName = res.data.goodsName
       })
     },