修改费用请核问题，自动带入客户

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -4751,7 +4751,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4787,7 +4787,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -5146,6 +5146,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -5159,6 +5160,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/Warehousing/components/payMoney.vue

@@ -117,6 +117,7 @@
       </div>
       <div style="margin: 0 10px;float: right">
         <el-button
+          v-if="true"
           icon="el-icon-setting"
           size="mini"
           circle
@@ -137,304 +138,485 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" width="80"> </el-table-column>
       <el-table-column
-        prop="fCorpid"
-        header-align="center"
-        align="center"
-        width="300px"
-        label="客户名称"
-      >
-        <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.fCorpid"
-            filterable
-            clearable
-            placeholder="客户名称"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-          >
-            <el-option
-              v-for="(item, index) in fMblnoOptions"
-              :key="index.fId"
-              :label="item.fName"
-              :value="item.fId"
-            ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fFeeid"
-        header-align="center"
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
         align="center"
-        width="240px"
-        label="费用名称"
+        :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+        sortable
       >
         <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.fFeeid"
-            clearable
-            filterable
-            placeholder="费用名称"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-          >
-            <el-option
-              v-for="(item, index) in fCNameOptions"
-              :key="index.fId"
-              :label="item.fName"
-              :value="item.fId"
-            ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fBusinessType"
-        header-align="center"
-        align="center"
-        width="180px"
-        label="作业类型"
-      >
-        <template slot-scope="scope">
-          <el-select
-            style="width: 80%"
-            v-model="scope.row.fBusinessType"
-            filterable
-            disabled
-          >
-            <el-option
-              v-for="(item, index) in businessTypeOption"
-              :key="index.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            ></el-option>
-          </el-select>
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        prop="fFeeUnitid"
-        header-align="center"
-        align="center"
-        width="180px"
-        label="计价单位"
-      >
-        <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.fFeeUnitid"
-            placeholder="请选择计价单位"
-            clearable
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            @change="changeFeeUnit(scope.row)"
-          >
-            <el-option
-              v-for="(item, index) in fFeetUnitOptions"
-              :key="index.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
+          <span v-if="item.label == 'fCorpid'">
+            <el-select
+              v-model="scope.row.fCorpid"
+              filterable
+              clearable
+              placeholder="客户名称"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+            >
+              <el-option
+                v-for="(item, index) in fMblnoOptions"
+                :key="index.fId"
+                :label="item.fName"
+                :value="item.fId"
+              ></el-option>
+            </el-select>
+          </span>
+          <span v-else-if="item.label == 'fFeeid'">
+            <el-select
+              v-model="scope.row.fFeeid"
+              clearable
+              filterable
+              placeholder="费用名称"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+            >
+              <el-option
+                v-for="(item, index) in fCNameOptions"
+                :key="index.fId"
+                :label="item.fName"
+                :value="item.fId"
+              ></el-option>
+            </el-select>
+          </span>
+          <span v-else-if="item.label == 'fBusinessType'">
+            <el-select
+              style="width: 80%"
+              v-model="scope.row.fBusinessType"
+              filterable
+              disabled
+            >
+              <el-option
+                v-for="(item, index) in businessTypeOption"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              ></el-option>
+            </el-select>
+          </span>
+          <span v-else-if="item.label == 'fFeeUnitid'">
+            <el-select
+              v-model="scope.row.fFeeUnitid"
+              placeholder="请选择计价单位"
+              clearable
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              @change="changeFeeUnit(scope.row)"
+            >
+              <el-option
+                v-for="(item, index) in fFeetUnitOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+            </el-select>
+          </span>
+          <span v-else-if="item.label == 'fQty'">
+            <el-input
+              oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
+              v-model="scope.row.fQty"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              @change="changeContractAmt(scope.row)"
+              placeholder="数量"
+              show-word-limit
             />
-          </el-select>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fQty"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="数量"
-      >
-        <template slot-scope="scope">
-          <el-input
-            oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'
-            v-model="scope.row.fQty"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            @change="changeContractAmt(scope.row)"
-            placeholder="数量"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fUnitprice"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="单价"
-      >
-        <template slot-scope="scope">
-          <el-input
-            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-            v-model="scope.row.fUnitprice"
-            :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
-            @change="changeContractAmt(scope.row)"
-            placeholder="单价"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fAmount"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="金额"
-      >
-        <template slot-scope="scope">
-          <el-input
-            disabled
-            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-            v-model="scope.row.fAmount"
-            placeholder="金额"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fStltypeid"
-        header-align="center"
-        align="center"
-        width="130px"
-        label="结算方式"
-      >
-        <template slot-scope="scope">
-          <el-select
-            v-model="scope.row.fStltypeid"
-            placeholder="请选择结算表票结、月结"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-          >
-            <el-option
-              v-for="(item, index) in fStltypeOptions"
-              :key="index.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            ></el-option>
-          </el-select>
+          </span>
+          <span v-else-if="item.label == 'fUnitprice'">
+            <el-input
+              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+              v-model="scope.row.fUnitprice"
+              :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"
+              @change="changeContractAmt(scope.row)"
+              placeholder="单价"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fAmount'">
+             <el-input
+               disabled
+               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
+               v-model="scope.row.fAmount"
+               placeholder="金额"
+               show-word-limit
+             />
+          </span>
+          <span v-else-if="item.label == 'fStltypeid'">
+            <el-select
+              v-model="scope.row.fStltypeid"
+              placeholder="请选择结算表票结、月结"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+            >
+              <el-option
+                v-for="(item, index) in fStltypeOptions"
+                :key="index.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              ></el-option>
+            </el-select>
+          </span>
+          <span v-else-if="item.label == 'fCurrency'">
+            <el-input
+              v-model="scope.row.fCurrency"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="币别"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fExrate'">
+            <el-input
+              v-model="scope.row.fExrate"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="汇率"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fTaxrate'">
+            <el-input
+              v-model="scope.row.fTaxrate"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="税率"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fMblno'">
+            <el-input
+              v-model="scope.row.fMblno"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="提单号"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fProductName'">
+            <el-input
+              v-model="scope.row.fProductName"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="品名"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fMarks'">
+            <el-input
+              v-model="scope.row.fMarks"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="品牌"
+              show-word-limit
+            />
+          </span>
+          <span v-else-if="item.label == 'fSrcTypeId'">
+            <span v-if="scope.row.fSrcTypeId === 0">录入</span>
+            <span v-if="scope.row.fSrcTypeId == 1">协议</span>
+            <span v-if="scope.row.fSrcTypeId == 10">变更</span>
+          </span>
+          <span v-else-if="item.label == 'remark'">
+            <el-input
+              v-model="scope.row.remark"
+              :disabled="browseStatus || scope.row.fBillstatus == 6"
+              placeholder="备注"
+              show-word-limit
+            />
+          </span>
         </template>
       </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="fCorpid"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="300px"-->
+<!--        label="客户名称"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-select-->
+<!--            v-model="scope.row.fCorpid"-->
+<!--            filterable-->
+<!--            clearable-->
+<!--            placeholder="客户名称"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="(item, index) in fMblnoOptions"-->
+<!--              :key="index.fId"-->
+<!--              :label="item.fName"-->
+<!--              :value="item.fId"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fFeeid"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="240px"-->
+<!--        label="费用名称"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-select-->
+<!--            v-model="scope.row.fFeeid"-->
+<!--            clearable-->
+<!--            filterable-->
+<!--            placeholder="费用名称"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="(item, index) in fCNameOptions"-->
+<!--              :key="index.fId"-->
+<!--              :label="item.fName"-->
+<!--              :value="item.fId"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fBusinessType"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="180px"-->
+<!--        label="作业类型"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-select-->
+<!--            style="width: 80%"-->
+<!--            v-model="scope.row.fBusinessType"-->
+<!--            filterable-->
+<!--            disabled-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="(item, index) in businessTypeOption"-->
+<!--              :key="index.dictValue"-->
+<!--              :label="item.dictLabel"-->
+<!--              :value="item.dictValue"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column
-        prop="fCurrency"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="币别"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.fCurrency"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="币别"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fExrate"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="汇率"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.fExrate"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="汇率"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fTaxrate"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="税率"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.fTaxrate"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="税率"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="fFeeUnitid"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="180px"-->
+<!--        label="计价单位"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-select-->
+<!--            v-model="scope.row.fFeeUnitid"-->
+<!--            placeholder="请选择计价单位"-->
+<!--            clearable-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            @change="changeFeeUnit(scope.row)"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="(item, index) in fFeetUnitOptions"-->
+<!--              :key="index.dictValue"-->
+<!--              :label="item.dictLabel"-->
+<!--              :value="item.dictValue"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fQty"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="数量"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            oninput='this.value=this.value.replace(/[^0-9.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/,"$1$2.$3")'-->
+<!--            v-model="scope.row.fQty"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            @change="changeContractAmt(scope.row)"-->
+<!--            placeholder="数量"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fUnitprice"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="单价"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--            v-model="scope.row.fUnitprice"-->
+<!--            :disabled="browseStatus || scope.row.fSrcTypeId !== 0 || scope.row.fBillstatus == 6"-->
+<!--            @change="changeContractAmt(scope.row)"-->
+<!--            placeholder="单价"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fAmount"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="金额"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            disabled-->
+<!--            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--            v-model="scope.row.fAmount"-->
+<!--            placeholder="金额"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fStltypeid"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="130px"-->
+<!--        label="结算方式"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-select-->
+<!--            v-model="scope.row.fStltypeid"-->
+<!--            placeholder="请选择结算表票结、月结"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="(item, index) in fStltypeOptions"-->
+<!--              :key="index.dictValue"-->
+<!--              :label="item.dictLabel"-->
+<!--              :value="item.dictValue"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column
-        prop="fMblno"
-        header-align="center"
-        align="center"
-        width="130px"
-        label="提单号"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.fMblno"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="提单号"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fProductName"
-        header-align="center"
-        align="center"
-        width="140px"
-        label="品名"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.fProductName"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="品名"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="fCurrency"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="币别"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.fCurrency"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="币别"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fExrate"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="汇率"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.fExrate"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="汇率"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fTaxrate"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="税率"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.fTaxrate"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="税率"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column
-        prop="fMarks"
-        header-align="center"
-        align="center"
-        width="130px"
-        label="品牌"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.fMarks"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="品牌"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="fSrcTypeId"
-        header-align="center"
-        align="center"
-        width="130px"
-        label="来源"
-      >
-        <template slot-scope="scope">
-          <span v-if="scope.row.fSrcTypeId === 0">录入</span>
-          <span v-if="scope.row.fSrcTypeId == 1">协议</span>
-          <span v-if="scope.row.fSrcTypeId == 10">变更</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
-        width="150px"
-        label="备注"
-      >
-        <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.remark"
-            :disabled="browseStatus || scope.row.fBillstatus == 6"
-            placeholder="备注"
-            show-word-limit
-          />
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="fMblno"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="130px"-->
+<!--        label="提单号"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.fMblno"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="提单号"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fProductName"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="140px"-->
+<!--        label="品名"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.fProductName"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="品名"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+<!--      <el-table-column-->
+<!--        prop="fMarks"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="130px"-->
+<!--        label="品牌"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.fMarks"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="品牌"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="fSrcTypeId"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="130px"-->
+<!--        label="来源"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <span v-if="scope.row.fSrcTypeId === 0">录入</span>-->
+<!--          <span v-if="scope.row.fSrcTypeId == 1">协议</span>-->
+<!--          <span v-if="scope.row.fSrcTypeId == 10">变更</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        prop="remark"-->
+<!--        header-align="center"-->
+<!--        align="center"-->
+<!--        width="150px"-->
+<!--        label="备注"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-input-->
+<!--            v-model="scope.row.remark"-->
+<!--            :disabled="browseStatus || scope.row.fBillstatus == 6"-->
+<!--            placeholder="备注"-->
+<!--            show-word-limit-->
+<!--          />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column
         header-align="center"
         align="center"
@@ -921,14 +1103,128 @@ export default {
       showSetting: false,
       setRowList: [],
       getRowList: [],
-      showfCustomno: null,
       //自定义列宽
       allCheck: false,
       drag: false,
-      tableDate: [],
+      tableDate: [
+        {
+          surface: "1",
+          label: "fCorpid",
+          name: "客户名称",
+          checked: 0,
+          width: 300,
+        },
+        {
+          surface: "2",
+          label: "fFeeid",
+          name: "费用名称",
+          checked: 0,
+          width: 240,
+        },
+        {
+          surface: "3",
+          label: "fFeeUnitid",
+          name: "计价单位",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "4",
+          label: "fQty",
+          name: "数量",
+          checked: 0,
+          width: 80,
+        },
+        {
+          surface: "5",
+          label: "fUnitprice",
+          name: "单价",
+          checked: 0,
+          width: 80,
+        },
+        {
+          surface: "6",
+          label: "fAmount",
+          name: "金额",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "7",
+          label: "fStltypeid",
+          name: "结算方式",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "fCurrency",
+          name: "币别",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fExrate",
+          name: "汇率",
+          checked: 0,
+          width: 80,
+        },
+        {
+          surface: "10",
+          label: "fTaxrate",
+          name: "税率",
+          checked: 0,
+          width: 80,
+        },
+        {
+          surface: "11",
+          label: "fBusinessType",
+          name: "作业类型",
+          checked: 0,
+          width: 180,
+        },
+        {
+          surface: "12",
+          label: "fMblno",
+          name: "提单号",
+          checked: 0,
+          width: 150,
+        },
+        {
+          surface: "13",
+          label: "fProductName",
+          name: "品名",
+          checked: 0,
+          width: 140,
+        },
+        {
+          surface: "14",
+          label: "fMarks",
+          name: "品牌",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "15",
+          label: "fSrcTypeId",
+          name: "来源",
+          checked: 0,
+          width: 130,
+        },
+        {
+          surface: "16",
+          label: "remark",
+          name: "备注",
+          checked: 0,
+          width: 150,
+        },
+      ],
     };
   },
   created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     this.company = Cookies.get("companyName")
     this.getConfigKey("taxpayer.identification.number").then((response) => {
       this.Identifier = response.msg;
@@ -1194,6 +1490,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -1208,6 +1505,7 @@ export default {
       revokefeeCheck(row.fId).then(res => {
         this.$message.success('操作成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)

src/views/Warehousing/costModify/AddOrUpdate.vue

@@ -920,6 +920,8 @@ export default {
       let list = JSON.parse(JSON.stringify(row))
       list.fId = ''
       list.fBillstatus = ''
+      list.createBy = null
+      list.createTime = null
       list.actId = 1100
       list.fSrcTypeId = 10
       this.formfeesList.push(list)

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -4183,7 +4183,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4219,7 +4219,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -4490,6 +4490,7 @@ export default {
     listCheck(row) {
       feesCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('请核成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
@@ -4504,6 +4505,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -7404,7 +7404,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -7441,7 +7441,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -7905,6 +7905,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -7918,6 +7919,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -236,6 +236,7 @@
                 :disabled="detailList.findIndex(function(item){return item.fBillstatus == 40}) == -1?false:true"
                 style="width: 80%"
                 placeholder="请输入模糊查找"
+                @change="fStorekeeperChange"
             >
               <el-option
                   v-for="(item, index) in userOptions"
@@ -532,7 +533,7 @@
             </el-row>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="发货方">
+                <el-form-item label="发货方(货主)">
                   <el-select
                     v-model="form.fShipper"
                     clearable
@@ -4995,7 +4996,7 @@
     >
       <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
-      <div id="print_area8" class="print-div">
+      <div id="print_area80" class="print-div">
         <div
             class="print-title"
             style="
@@ -5016,34 +5017,34 @@
             <tr>
               <td>品名</td>
               <td colspan="3">{{ form.goodName }}</td>
-              <td colspan="2">清单号</td>
-              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+              <td colspan="2">提单号</td>
+              <td colspan="3">{{ form.fMblno }}</td>
             </tr>
             <tr>
-              <td class="oneHundredSix" style="width: 160px;">入库日期</td>
-              <td class="twoHundred" style="width: 200px;">箱号</td>
+              <td>入库日期</td>
+              <td>箱号</td>
               <td>铅封号</td>
-              <td>预计件数</td>
-              <td>垛位</td>
-              <td>实收件数</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 1">实收净重（吨）</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 1">毛重（吨）</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 2">实收净重（千克）</td>
-              <td class="oneHundred" style="width: 100px;" v-if="radio == 2">毛重（千克）</td>
-              <td class="twoHundred" style="width: 200px;">备注</td>
+              <td width="6%">预计</td>
+              <td width="8%">垛位</td>
+              <td width="6%">实收</td>
+              <td v-if="radio == 1">实收净重(吨)</td>
+              <td v-if="radio == 1">毛重(吨)</td>
+              <td v-if="radio == 2">实收净重(千克)</td>
+              <td v-if="radio == 2">毛重(千克)</td>
+              <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fBsdate }}&nbsp;{{ timeOut }}</td>
+              <td>{{ item.fBsdate }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fSealno }}</td>
               <td>{{ item.fQty }}</td>
-              <td>{{ item.fWarehouseInformation }}</td>
+              <td>{{ item.fWarehouseInformation? item.fWarehouseInformation.substring((item.fWarehouseInformation.lastIndexOf("/")) + 1, item.fWarehouseInformation.length): '' }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="radio == 1">{{ (item.fNetweight / 1000).toSuperFixed(4) }}</td>
               <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toSuperFixed(4) }}</td>
               <td v-if="radio == 2">{{ item.fNetweight }}</td>
               <td v-if="radio == 2">{{ item.fGrossweight }}</td>
-              <td>{{ item.remark }}</td>
+              <td style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{ item.remark }}</td>
             </tr>
             <tr>
               <td>合计：</td>
@@ -5442,7 +5443,7 @@
               <td width="10%">{{ isfQty == 0? item.fBsdate: '' }}&nbsp;{{ isfQty == 0? inTime: '' }}</td>
               <td width="10%">{{ item.fTruckno }}</td>
               <td width="10%">{{ item.fDriverName }}</td>
-              <td width="24%">{{ item.remark }}</td>
+              <td width="24%" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{ item.remark }}</td>
             </tr>
             <tr>
               <td colspan="2">合计：</td>
@@ -5711,7 +5712,7 @@
     >
       <el-radio v-model="radio" :label="1" @change="radioChange">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2" @change="radioChange">千克（KG）</el-radio>
-      <div id="print_area10" class="print-div">
+      <div id="print_area100" class="print-div">
         <div
             class="print-title"
             style="
@@ -5750,17 +5751,17 @@
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
             <tr>
-              <td>序号</td>
-              <td>实际入库日期</td>
-              <td>商品名称</td>
-              <td>提单号</td>
-              <td>箱号</td>
-              <td>件数</td>
-              <td v-if="radio == 1">毛重（吨）</td>
-              <td v-if="radio == 1">净重（吨）</td>
-              <td v-if="radio == 2">毛重（千克）</td>
-              <td v-if="radio == 2">净重（千克）</td>
-              <td>备注</td>
+              <td width="4%">序号</td>
+              <td width="10%">入库日期</td>
+              <td width="8%">商品名称</td>
+              <td width="15%">提单号</td>
+              <td width="13%">箱号</td>
+              <td width="5%">件数</td>
+              <td v-if="radio == 1" width="8%">毛重(吨)</td>
+              <td v-if="radio == 1" width="8%">净重(吨)</td>
+              <td v-if="radio == 2" width="8%">毛重(千克)</td>
+              <td v-if="radio == 2" width="8%">净重(千克)</td>
+              <td width="13%">备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ index + 1 }}</td>
@@ -5776,7 +5777,7 @@
               <td>{{ item.remark }}</td>
             </tr>
             <tr>
-              <td>合计：</td>
+              <td>合计</td>
               <td></td>
               <td></td>
               <td></td>
@@ -6688,6 +6689,7 @@ export default {
     });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
+      console.log(this.fStltypeOptions)
     });
     this.getDicts("data_unitfees").then((response) => {
       this.fFeetUnitOptions = response.data;
@@ -8233,7 +8235,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -8414,6 +8416,7 @@ export default {
       }
     },
     imporComputer() {
+      return
       this.playcomputer();
     },
     // 入库明细新增list
@@ -8848,7 +8851,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -8884,6 +8887,7 @@ export default {
           this.$set(this.form, "fDeptid", this.userVal.deptId);
           this.$set(this.form, "createBy", this.userVal.userName);
           this.$set(this.form, "fStorekeeper", this.userVal.nickName);
+          this.$set(this.form, "fContacts", this.userVal.nickName);
           this.$set(this.form, "fIfdamage", "1");
           this.$set(this.form, "fIfweigh", "1");
           this.$set(this.form, "fTrademodeid", "1");
@@ -9082,7 +9086,7 @@ export default {
               "@page {  } " +
               "@media print {.oneHundred{width: 100px} .twoHundred{width: 200px} .oneHundredSix{width: 160px} .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_form{font-size:12px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;font-size:12px} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
           print({
-            printable: "print_area8",
+            printable: "print_area80",
             type: "html",
             style: stylEe, // 亦可使用引入的外部css;
             scanStyles: false,
@@ -9098,7 +9102,7 @@ export default {
           break
         case 'khrkd':
           print({
-            printable: "print_area10",
+            printable: "print_area100",
             type: "html",
             style: style, // 亦可使用引入的外部css;
             scanStyles: false,
@@ -9311,7 +9315,7 @@ export default {
     // 获取仓库信息
     warehouseChange() {
       getDept(this.form.fWarehouseid).then(res => {
-        this.$set(this.form, 'fContacts', res.data.fContacts)
+        // this.$set(this.form, 'fContacts', res.data.fContacts)
         this.$set(this.form, 'fTel', res.data.fTel)
       })
     },
@@ -9363,6 +9367,9 @@ export default {
     addDetailList(list) {
       this.detailList.push(...list);
     },
+    fStorekeeperChange() {
+      this.$set(this.form, 'fContacts', this.form.fStorekeeper)
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -6016,7 +6016,7 @@ export default {
             return false;
           } else {
             this.warehouseDrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -6052,7 +6052,7 @@ export default {
             return this.$message.error("请维护作业类型");
           } else {
             this.warehouseCrList.push({
-              fCorpid: null,
+              fCorpid: this.form.fCorpid,
               fFeeid: null,
               fFeeUnitid: "",
               fQty: null,
@@ -6481,6 +6481,7 @@ export default {
       feesCheck(row.fId).then(res => {
         this.$message.success('请核成功')
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)
           this.warehouseDrList.splice(index, 1, res.data)
@@ -6495,6 +6496,7 @@ export default {
     revokeListCheck(row) {
       revokefeeCheck(row.fId).then(res => {
         res.data.fFeeUnitid = res.data.fFeeunitid.toString();
+        res.data.fStltypeid = res.data.fStltypeid.toString();
         this.$message.success('操作成功')
         if (res.data.fDc == 'D') {
           let index = this.warehouseDrList.findIndex(item => item.fId == res.data.fId)