财务修改

src/views/finance/applyForInvoice/chargeInvoice/index.vue

@@ -912,11 +912,40 @@
         v-dialogDrag
         :fullscreen="dialogFull"
         :close-on-click-modal="false"
-        width="70%"
+        width="78%"
         :visible.sync="innerVisible"
         title="导入数据"
         append-to-body
       >
+        <template slot="title">
+          <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title" style="font-size: 18px;font-weight: bold;color: #606266;">
+              <span
+                style="
+                  display: inline-block;
+                  width: 3px;
+                  height: 20px;
+                  margin-right: 5px;
+                  float: left;
+                  margin-top: 2px;
+                "
+              ></span>检索
+            </span>
+            <div class="avue-crud__dialog__menu enlarge" @click="full">
+              <i
+                style="
+                  cursor: pointer;
+                  display: block;
+                  width: 12px;
+                  height: 12px;
+                  border: 1px solid #909399;
+                  border-top: 3px solid #909399;
+                  margin-top: -3px;
+                "
+              ></i>
+            </div>
+          </div>
+        </template>
         <el-form
           ref="form"
           :model="queryParameter"
@@ -992,7 +1021,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
             <el-col :span="6">
               <el-form-item label="费用名称" prop="fFeeid">
@@ -1047,7 +1075,7 @@
                 >
                   <el-option
                     v-for="dict in businessTypeOption"
-                    :key="dict.dictValue"
+                    :key="dict.index"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
                   >
@@ -1176,22 +1204,104 @@
 
             <el-col :span="8">
               <el-form-item style="width: 350px">
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="importSearch"
-            >搜索
-            </el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s"
-            >重置
-            </el-button
-            >
           </el-form-item>
             </el-col>
           </el-row>
         </el-form>
+        <div style="margin-right: 20px;float: right">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="importSearch"
+          >搜索
+          </el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s"
+          >重置
+          </el-button
+          >
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="showSetting4 = !showSetting4"
+          ></el-button>
+        </div>
+        <el-dialog
+          title="自定义列显示"
+          :visible.sync="showSetting4"
+          width="700px"
+          v-dialogDrag
+          append-to-body
+        >
+          <template slot="title">
+            <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title">
+              <span
+                style="
+                  display: inline-block;
+                  width: 3px;
+                  height: 20px;
+                  margin-right: 5px;
+                  float: left;
+                  margin-top: 2px;
+                "
+              ></span>
+            </span>
+            </div>
+          </template>
+          <div>配置排序列数据（拖动调整顺序）</div>
+          <div style="margin-left: 17px">
+            <el-checkbox
+              v-model="allCheck4"
+              label="全选"
+              @change="allChecked4"
+            ></el-checkbox>
+          </div>
+          <div style="padding: 4px; display: flex; justify-content: center">
+            <draggable
+              v-model="setRowList4"
+              group="site"
+              animation="300"
+              @start="onStart"
+              @end="onEnd"
+              handle=".indraggable"
+            >
+              <transition-group>
+                <div
+                  v-for="item in setRowList4"
+                  :key="item.surface"
+                  class="listStyle"
+                >
+                  <div style="width: 500px" class="indraggable">
+                    <div class="progress" :style="{ width: item.width + 'px' }">
+                      <el-checkbox
+                        :label="item.name"
+                        v-model="item.checked"
+                        :true-label="0"
+                        :false-label="1"
+                      >{{ item.name }}
+                      </el-checkbox>
+                    </div>
+                  </div>
+                  <el-input-number
+                    v-model.number="item.width"
+                    controls-position="right"
+                    :min="1"
+                    :max="500"
+                    size="mini"
+                  ></el-input-number>
+                </div>
+              </transition-group>
+            </draggable>
+          </div>
+          <span slot="footer" class="dialog-footer">
+          <el-button @click="showSetting4 = false">取 消</el-button>
+          <el-button @click="delRow4" type="danger">重 置</el-button>
+          <el-button type="primary" @click="save4()">确 定</el-button>
+        </span>
+        </el-dialog>
         <el-table
           v-loading="loading"
           :data="chargeList_s"
@@ -1199,64 +1309,89 @@
           show-summary
           :summary-method="getSum"
           @selection-change="handleSelectionChange_s"
-          show-overflow-tooltip
         >
           <el-table-column type="selection" width="55" align="center"/>
+          <el-table-column label="序号" type="index" width="55" align="center"/>
           <el-table-column
-            label="序号"
-            type="index"
-            width="55"
-            align="center"
-          />
-          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip="true"/>
-          <el-table-column label="提单号" align="center" prop="fMblno"/>
-          <el-table-column label="船名" align="center" prop="boatName"/>
-          <el-table-column label="航次" align="center" prop="voyageName"/>
-          <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 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>
-              <span v-else>{{ scope.row.fBilltype }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="作业类型" align="center" prop="fBusinessType" v-if="typevalue == 1 || typevalue == 2"/>
-          <el-table-column label="审核日期" align="center" prop="fReviewDate" width="100px"/>
-          <el-table-column label="费用名称" align="center" prop="fFeeName" width="100px" show-overflow-tooltip="true"/>
-          <el-table-column label="金额" align="center" prop="fAmtdr"/>
-          <el-table-column
-            label="本次金额"
+            v-for="(item, index) in getRowList4"
+            :key="index"
+            :label="item.name"
+            :width="item.width"
+            :prop="item.label"
             align="center"
-            prop="fAmt"
-            width="100"
+            :fixed="item.fixed"
+            :show-overflow-tooltip="true"
+            sortable
           >
             <template slot-scope="scope">
+              <span v-if="item.label == 'fName'">{{scope.row.fName}}</span>
+              <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
+              <span v-if="item.label == 'boatName'">{{scope.row.boatName}}</span>
+              <span v-if="item.label == 'voyageName'">{{scope.row.voyageName}}</span>
+              <span v-if="item.label == 'fProductName'">{{scope.row.fProductName}}</span>
+              <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fBsdate}}</span>
+              <span v-if="item.label == 'fBilltype'">
+                <template>
+                  <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
+                  <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
+                  <span v-else>{{ scope.row.fBilltype }}</span>
+                </template>
+              </span>
+              <span v-if="item.label == 'fBusinessType'">{{scope.row.fBusinessType}}</span>
+              <span v-if="item.label == 'fReviewDate'">{{scope.row.fReviewDate}}</span>
+              <span v-if="item.label == 'fFeeName'">{{scope.row.fFeeName}}</span>
+              <span v-if="item.label == 'fAmtdr'">{{scope.row.fAmtdr}}</span>
               <el-input
-                v-model="scope.row.fAmt"
-                placeholder="请输入本次金额"
-                clearable
-                size="small"
+                v-model="scope.row.fAmt" v-if="item.label == 'fAmt'"
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                @change="imgChangeI(scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" align="center" prop="fRemarks" width="200px">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.fRemarks"
-                placeholder="请输入备注"
-                clearable
-                size="small"
-                width="100"
-              />
+                @change="imgChangeI(scope.row)"/>
+              <el-input v-model="scope.row.fRemarks" v-if="item.label == 'fRemarks'"/>
             </template>
           </el-table-column>
+<!--          <el-table-column label="货权方" align="center" prop="fName" width="200px" :show-overflow-tooltip="true"/>-->
+<!--          <el-table-column label="提单号" align="center" prop="fMblno"/>-->
+<!--          <el-table-column label="船名" align="center" prop="boatName"/>-->
+<!--          <el-table-column label="航次" align="center" prop="voyageName"/>-->
+<!--          <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 ? scope.row.fBsdate.slice(0, 10) : scope.row.fBsdate }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <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>-->
+<!--              <span v-else>{{ scope.row.fBilltype }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="作业类型" align="center" prop="fBusinessType" v-if="typevalue == 1 || typevalue == 2"/>-->
+<!--          <el-table-column label="审核日期" align="center" prop="fReviewDate" width="100px"/>-->
+<!--          <el-table-column label="费用名称" align="center" prop="fFeeName" width="100px" :show-overflow-tooltip="true"/>-->
+<!--          <el-table-column label="金额" align="center" prop="fAmtdr"/>-->
+<!--          <el-table-column label="本次金额" align="center" prop="fAmt" width="100">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fAmt"-->
+<!--                placeholder="请输入本次金额"-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--                @change="imgChangeI(scope.row)"-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="备注" align="center" prop="fRemarks" width="200px">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fRemarks"-->
+<!--                placeholder="请输入备注"-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                width="100"-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="confirmImport">确 定</el-button>
@@ -1563,6 +1698,99 @@ export default {
           width: 100
         }
       ],
+      tableDate4: [
+        {
+          surface: '1',
+          label: 'fName',
+          name: '货权方',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '2',
+          label: 'fMblno',
+          name: '提单号',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '3',
+          label: 'boatName',
+          name: '船名',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '4',
+          label: 'voyageName',
+          name: '航次',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '5',
+          label: 'fProductName',
+          name: '品名',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '6',
+          label: 'fBsdate',
+          name: '业务日期',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '7',
+          label: 'fBilltype',
+          name: '业务类型',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '8',
+          label: 'fBusinessType',
+          name: '作业类型',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '9',
+          label: 'fReviewDate',
+          name: '审核日期',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '10',
+          label: 'fFeeName',
+          name: '费用名称',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '11',
+          label: 'fAmtdr',
+          name: '金额',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '12',
+          label: 'fAmt',
+          name: '本次金额',
+          checked: 0,
+          width: 100
+        },
+        {
+          surface: '13',
+          label: 'fRemarks',
+          name: '备注',
+          checked: 0,
+          width: 100
+        },
+      ],
       tableDate3: [
         {
           surface: '1',
@@ -1680,6 +1908,10 @@ export default {
       showSetting2: false,
       allCheck3: false,
       showSetting3: false,
+      allCheck4: false,
+      showSetting4: false,
+      setRowList4: [],
+      getRowList4: [],
       typevalue: '',
       typeoptions: [
         {
@@ -1840,6 +2072,8 @@ export default {
     this.getRowList2 = this.tableDate2
     this.setRowList3 = this.tableDate3
     this.getRowList3 = this.tableDate3
+    this.setRowList4 = this.tableDate4
+    this.getRowList4 = this.tableDate4
     this.typevalue = Cookies.get('sysType')
     this.getList()
     this.register()
@@ -1859,8 +2093,10 @@ export default {
     this.getRow()
     this.getRow2()
     this.getRow3()
+    this.getRow4()
     this.feeName()
     this.portRemthod()
+    this.corpsRemoteMethod()
   },
   activated() {
     if (this.$route.query.data) {
@@ -1871,7 +2107,6 @@ export default {
         this.adoPt()
       }
     }
-
   },
   methods: {
     handleClose(done) {
@@ -2173,6 +2408,68 @@ export default {
       })
     },
 
+    //列设置全选
+    allChecked4() {
+      if (this.allCheck4 == true) {
+        this.setRowList4.map((e) => {
+          return (e.checked = 0)
+        })
+      } else {
+        this.setRowList4.map((e) => {
+          return (e.checked = 1)
+        })
+      }
+    },
+    //查询列数据
+    getRow4() {
+      let that = this
+      this.data = {
+        tableName: '弹窗申请发票',
+        userId: Cookies.get('userName')
+      }
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList4 = res.data.filter((e) => e.checked == 0)
+          this.setRowList4 = res.data
+          this.setRowList4 = this.setRowList4.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed
+            })
+            return res
+          }, [])
+        }
+      })
+    },
+    //保存列设置
+    save4() {
+      this.showSetting4 = false
+      this.data = {
+        tableName: '4弹窗申请发票',
+        userId: Cookies.get('userName'),
+        sysTableSetList: this.setRowList4
+      }
+      addSet(this.data).then((res) => {
+        this.getRowList4 = this.setRowList4.filter((e) => e.checked == 0)
+      })
+    },
+    //重置列表
+    delRow4() {
+      this.data = {
+        tableName: '4弹窗申请发票',
+        userId: Cookies.get('userName')
+      }
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting4 = false
+          this.setRowList4 = this.getRowList4 = this.$options.data().tableDate4
+        }
+      })
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true
@@ -3208,9 +3505,9 @@ export default {
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
-      if (name == null || name === '') {
-        return false
-      }
+      // if (name == null || name === '') {
+      //   return false
+      // }
       let queryParams = { fName: name }
       listCorps(queryParams).then((response) => {
         this.fMblnoOptions = response
@@ -3680,3 +3977,8 @@ export default {
   content: "\e719";
 }
 </style>
+<style lang="scss">
+.el-dialog__body{
+  padding: 0 20px 30px 20px;
+}
+</style>

src/views/finance/charge/index.vue

@@ -764,11 +764,40 @@
         v-dialogDrag
         :fullscreen="dialogFull"
         :close-on-click-modal="false"
-        width="70%"
+        width="78%"
         :visible.sync="innerVisible"
         title="导入数据"
         append-to-body
       >
+        <template slot="title">
+          <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title" style="font-size: 18px;font-weight: bold;color: #606266;">
+              <span
+                style="
+                  display: inline-block;
+                  width: 3px;
+                  height: 20px;
+                  margin-right: 5px;
+                  float: left;
+                  margin-top: 2px;
+                "
+              ></span>检索
+            </span>
+            <div class="avue-crud__dialog__menu enlarge" @click="full">
+              <i
+                style="
+                  cursor: pointer;
+                  display: block;
+                  width: 12px;
+                  height: 12px;
+                  border: 1px solid #909399;
+                  border-top: 3px solid #909399;
+                  margin-top: -3px;
+                "
+              ></i>
+            </div>
+          </div>
+        </template>
         <el-form
           ref="form"
           :model="queryParameter"
@@ -847,7 +876,6 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="费用名称" prop="fFeeid">
-            <template>
               <el-select
                 v-model="queryParameter.fFeeid"
                 filterable
@@ -866,48 +894,47 @@
                 >
                 </el-option>
               </el-select>
-            </template>
           </el-form-item>
             </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: 160px"
-              @change="changefBilltype"
-              placeholder="请选择仓储业务"
-            >
-              <el-option label="入库" value="SJRK"></el-option>
-              <el-option label="出库" value="SJCK"></el-option>
-              <el-option label="货权转移" value="HQZY"></el-option>
-            </el-select>
-          </el-form-item>
+                <el-select
+                  v-model="queryParameter.fBilltype"
+                  size="small"
+                  style="width: 160px"
+                  @change="changefBilltype"
+                  placeholder="请选择仓储业务"
+                >
+                  <el-option label="入库" value="SJRK"></el-option>
+                  <el-option label="出库" value="SJCK"></el-option>
+                  <el-option label="货权转移" value="HQZY"></el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item
-            label="作业类型"
-            prop="fBusinessType"
-            v-if="typevalue == 1 || typevalue == 3"
-          >
-            <el-select
-              v-model="queryParameter.fBusinessType"
-              filterable
-              remote
-              size="small"
-              style="width: 160px"
-              placeholder="作业类型"
-              multiple
-            >
-              <el-option
-                v-for="dict in businessTypeOption"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
+                label="作业类型"
+                prop="fBusinessType"
+                v-if="typevalue == 1 || typevalue == 3"
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
+                <el-select
+                  v-model="queryParameter.fBusinessType"
+                  filterable
+                  remote
+                  size="small"
+                  style="width: 160px"
+                  placeholder="作业类型"
+                  multiple
+                >
+                  <el-option
+                    v-for="(dict,index) in businessTypeOption"
+                    :key="dict.index"
+                    :label="dict.dictLabel"
+                    :value="dict.dictValue"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="6" style="width: 240px"></el-col>
           </el-row>
@@ -953,20 +980,102 @@
             </el-col>
             <el-col :span="8" style="width: 320px">
               <el-form-item>
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="importSearch"
-            >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s"
-            >重置</el-button
-            >
           </el-form-item>
             </el-col>
           </el-row>
         </el-form>
+        <div style="margin-right: 20px;float: right">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="importSearch"
+          >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s"
+          >重置</el-button
+          >
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="showSetting3 = !showSetting3"
+          ></el-button>
+        </div>
+        <el-dialog
+          title="自定义列显示"
+          :visible.sync="showSetting3"
+          width="700px"
+          v-dialogDrag
+          append-to-body
+        >
+          <template slot="title">
+            <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title">
+              <span
+                style="
+                  display: inline-block;
+                  width: 3px;
+                  height: 20px;
+                  margin-right: 5px;
+                  float: left;
+                  margin-top: 2px;
+                "
+              ></span>
+            </span>
+            </div>
+          </template>
+          <div>配置排序列数据（拖动调整顺序）</div>
+          <div style="margin-left: 17px">
+            <el-checkbox
+              v-model="allCheck3"
+              label="全选"
+              @change="allChecked3"
+            ></el-checkbox>
+          </div>
+          <div style="padding: 4px; display: flex; justify-content: center">
+            <draggable
+              v-model="setRowList3"
+              group="site"
+              animation="300"
+              @start="onStart"
+              @end="onEnd"
+              handle=".indraggable"
+            >
+              <transition-group>
+                <div
+                  v-for="item in setRowList3"
+                  :key="item.surface"
+                  class="listStyle"
+                >
+                  <div style="width: 500px" class="indraggable">
+                    <div class="progress" :style="{ width: item.width + 'px' }">
+                      <el-checkbox
+                        :label="item.name"
+                        v-model="item.checked"
+                        :true-label="0"
+                        :false-label="1"
+                      >{{ item.name }}
+                      </el-checkbox>
+                    </div>
+                  </div>
+                  <el-input-number
+                    v-model.number="item.width"
+                    controls-position="right"
+                    :min="1"
+                    :max="500"
+                    size="mini"
+                  ></el-input-number>
+                </div>
+              </transition-group>
+            </draggable>
+          </div>
+          <span slot="footer" class="dialog-footer">
+          <el-button @click="showSetting3 = false">取 消</el-button>
+          <el-button @click="delRow3" type="danger">重 置</el-button>
+          <el-button type="primary" @click="save3()">确 定</el-button>
+        </span>
+        </el-dialog>
         <el-table
           v-loading="loading"
           :data="chargeList_s"
@@ -976,63 +1085,93 @@
           @selection-change="handleSelectionChange_s"
         >
           <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" type="index" width="55" align="center"/>
           <el-table-column
-            label="序号"
-            type="index"
-            width="55"
+            v-for="(item, index) in getRowList3"
+            :key="index"
+            :label="item.name"
+            :width="item.width"
+            :prop="item.label"
             align="center"
-          />
-          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip/>
-          <el-table-column label="提单号" align="center" prop="fMblno" />
-          <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">
-            <template slot-scope="scope">
-              <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
-              <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-              <span v-else>{{ scope.row.fBilltype }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="作业类型"
-            align="center"
-            prop="fBusinessType"
-          />
-          <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="本次金额"
-            align="center"
-            prop="fAmt"
-            width="100"
+            :fixed="item.fixed"
+            :show-overflow-tooltip="true"
+            sortable
           >
             <template slot-scope="scope">
+              <span v-if="item.label == 'fName'">{{scope.row.fName}}</span>
+              <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
+              <span v-if="item.label == 'fProductName'">{{scope.row.fProductName}}</span>
+              <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fBsdate}}</span>
+              <span v-if="item.label == 'fBilltype'">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
+                  <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
+                  <span v-else>{{ scope.row.fBilltype }}</span>
+                </template>
+              </span>
+              <span v-if="item.label == 'fBusinessType'">{{scope.row.fBusinessType}}</span>
+              <span v-if="item.label == 'fReviewDate'">{{scope.row.fReviewDate}}</span>
+              <span v-if="item.label == 'fFeeName'">{{scope.row.fFeeName}}</span>
+              <span v-if="item.label == 'fAmtdr'">{{scope.row.fAmtdr}}</span>
               <el-input
-                v-model="scope.row.fAmt"
-                placeholder="请输入本次金额"
-                clearable
-                size="small"
+                v-model="scope.row.fAmt" v-if="item.label == 'fAmt'"
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                @change="imgChangeI(scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" align="center" prop="fRemarks">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.fRemarks"
-                placeholder="请输入备注"
-                clearable
-                size="small"
-                width="100"
-              />
+                @change="imgChangeI(scope.row)"/>
+              <el-input v-model="scope.row.fRemarks" v-if="item.label == 'fRemarks'"/>
             </template>
           </el-table-column>
+
+<!--          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip/>-->
+<!--          <el-table-column label="提单号" align="center" prop="fMblno" />-->
+<!--          <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">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>-->
+<!--              <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>-->
+<!--              <span v-else>{{ scope.row.fBilltype }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="作业类型"-->
+<!--            align="center"-->
+<!--            prop="fBusinessType"-->
+<!--          />-->
+<!--          <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="本次金额"-->
+<!--            align="center"-->
+<!--            prop="fAmt"-->
+<!--            width="100"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fAmt"-->
+<!--                placeholder="请输入本次金额"-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--                @change="imgChangeI(scope.row)"-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="备注" align="center" prop="fRemarks">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fRemarks"-->
+<!--                placeholder="请输入备注"-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                width="100"-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="confirmImport">确 定</el-button>
@@ -1417,12 +1556,95 @@ export default {
           width: 100,
         },
       ],
+      tableDate3: [
+        {
+          surface: "1",
+          label: "fName",
+          name: "货权方",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "fMblno",
+          name: "提单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
+          label: "fProductName",
+          name: "品名",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "4",
+          label: "fBsdate",
+          name: "业务日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "5",
+          label: "fBilltype",
+          name: "业务类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "6",
+          label: "fBusinessType",
+          name: "作业类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "7",
+          label: "fReviewDate",
+          name: "审核日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "fFeeName",
+          name: "费用名称",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fAmtdr",
+          name: "金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "fAmt",
+          name: "本次金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "fRemarks",
+          name: "备注",
+          checked: 0,
+          width: 100,
+        },
+      ],
       setRowList: [],
       getRowList: [],
       setRowList2: [],
       getRowList2: [],
       allCheck2: false,
       showSetting2: false,
+      setRowList3: [],
+      getRowList3: [],
+      allCheck3: false,
+      showSetting3: false,
       typevalue: "",
       typeoptions: [
         {
@@ -1579,6 +1801,8 @@ export default {
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
     this.getRowList2 = this.tableDate2;
+    this.setRowList3 = this.tableDate3;
+    this.getRowList3 = this.tableDate3;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -1589,7 +1813,9 @@ export default {
       this.methodOptions = response.data;
     });
     this.getRow();
-    this.getRow2();
+    // this.getRow2();
+    this.getRow3();
+    this.corpsRemoteMethod()
   },
   activated() {
     console.log(this.$route.query.data)
@@ -1786,6 +2012,68 @@ export default {
         }
       });
     },
+    //列设置全选
+    allChecked3() {
+      if (this.allCheck3 == true) {
+        this.setRowList3.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList3.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow3() {
+      let that = this;
+      this.data = {
+        tableName: "收费明细",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList3 = res.data.filter((e) => e.checked == 0);
+          this.setRowList3 = res.data;
+          this.setRowList3 = this.setRowList3.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+    //保存列设置
+    save3() {
+      this.showSetting3 = false;
+      this.data = {
+        tableName: "收费明细",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList3,
+      };
+      addSet(this.data).then((res) => {
+        this.getRowList3 = this.setRowList3.filter((e) => e.checked == 0);
+      });
+    },
+    //重置列表
+    delRow3() {
+      this.data = {
+        tableName: "收费明细",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting3 = false;
+          this.setRowList3 = this.getRowList3 = this.$options.data().tableDate3
+        }
+      });
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true;
@@ -2421,9 +2709,9 @@ export default {
       this.chargeList_s = [];
       // this.queryParameter.fToCorpid = this.queryParams.fCorpid
       this.innerVisible = true;
-      if (this.queryParams.fCorpid) {
-        this.doNot = true;
-      }
+      // if (this.queryParams.fCorpid) {
+      //   this.doNot = true;
+      // }
     },
     getSum(param) {
       const { columns, data } = param;
@@ -2505,7 +2793,14 @@ export default {
             this.empty.push(this.selection[item].fMblno);
             this.nothing.push(this.selection[item].fName);
             if (this.increase_s.length === 0) {
-              this.increase_s = this.increase_s.concat(this.selection);
+              this.increase_s = this.increase_s.concat(this.selection)
+              for(let li in this.increase_s){
+                if(this.increase_s[li].fSrcdc == 'D'){
+                  this.increase_s[li].fSrcdc = "收"
+                }else if(this.increase_s[li].fSrcdc == 'C'){
+                  this.increase_s[li].fSrcdc = "付"
+                }
+              }
               //去重提单号
               this.empty = new Set(this.empty);
               this.empty = Array.from(this.empty);
@@ -2545,6 +2840,13 @@ export default {
             }else {
               for (let li in this.increase_s) {
                 if (this.selection[item].fSrcid !== this.increase_s[li].fSrcid) {
+                  for(let li in this.increase_s){
+                    if(this.increase_s[li].fSrcdc == 'D'){
+                      this.increase_s[li].fSrcdc = "收"
+                    }else if(this.increase_s[li].fSrcdc == 'C'){
+                      this.increase_s[li].fSrcdc = "付"
+                    }
+                  }
                   this.Fee = this.increase_s.concat(this.selection);
                   console.log(this.Fee);
                   let result = [];
@@ -2797,9 +3099,9 @@ export default {
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
+      // if (name == null || name === "") {
+      //   return false;
+      // }
       let queryParams = { fName: name };
       listCorps(queryParams).then((response) => {
         this.fMblnoOptions = response;
@@ -3243,3 +3545,8 @@ export default {
   content: "\e719";
 }
 </style>
+<style lang="scss">
+.el-dialog__body{
+  padding: 0 20px 30px 20px;
+}
+</style>

src/views/finance/contrast/index.vue

@@ -387,7 +387,7 @@
         ref="ruless"
         :model="queryParams"
         :rules="ruless"
-        label-width="68px"
+        label-width="78px"
         :inline="true"
         v-show="showSearch"
       >
@@ -403,7 +403,7 @@
           />
         </el-form-item>
 
-        <el-form-item label="结算单位" label-width="78px" prop="fCorpid">
+        <el-form-item label="结算单位" prop="fCorpid">
           <el-select
             v-model="queryParams.fCorpid"
             placeholder="请选择结算单位"
@@ -429,7 +429,7 @@
           <el-input v-model="TWareHouseFees.tMblno" placeholder="" :disabled="true"/>
       </el-form-item> -->
 
-        <el-form-item label="对账日期" prop="fAccbilldate" label-width="78px">
+        <el-form-item label="对账日期" prop="fAccbilldate" >
           <el-date-picker
             v-model="queryParams.fAccbilldate"
             size="small"
@@ -454,7 +454,11 @@
           />
         </el-form-item>
         <el-form-item label="录入人" prop="createBy">
-          <el-input v-model="queryParams.createBy" disabled />
+          <el-input
+            v-model="queryParams.createBy"
+            disabled
+            size="small"
+            style="width: 200px"/>
         </el-form-item>
 
         <el-form-item label="备注" prop="fRemarks">
@@ -644,6 +648,7 @@
           align="center"
           :fixed="item.fixed"
           :show-overflow-tooltip="true"
+          sortable
         />
         <!-- <el-table-column label="提单号" align="center" prop="fMblno" />
         <el-table-column label="业务日期" align="center" prop="fBsdate">
@@ -743,7 +748,7 @@
       >
         <template slot="title">
           <div class="avue-crud__dialog__header">
-            <span class="el-dialog__title">
+            <span class="el-dialog__title" style="font-size: 18px;font-weight: bold;color: #606266;">
               <span
                 style="
                   display: inline-block;
@@ -753,7 +758,7 @@
                   float: left;
                   margin-top: 2px;
                 "
-              ></span>
+              ></span>检索
             </span>
             <div class="avue-crud__dialog__menu enlarge" @click="full">
               <i
@@ -965,18 +970,97 @@
           </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
-            >
-            <el-button type="info" size="mini" @click="resetQuery_s"
-            >重置</el-button
-            >
-          </el-form-item>
             </el-col>
           </el-row>
+            <div style="margin-right: 20px;float: right">
+              <el-button type="cyan" size="mini" @click="searchFee(typevalue)"
+              >搜索</el-button
+              >
+              <el-button type="info" size="mini" @click="resetQuery_s"
+              >重置</el-button
+              >
+              <el-button
+                icon="el-icon-setting"
+                size="mini"
+                circle
+                @click="showSetting3 = !showSetting3"
+              ></el-button>
+            </div>
 
+          <el-dialog
+            title="自定义列显示"
+            :visible.sync="showSetting3"
+            width="700px"
+            v-dialogDrag
+            append-to-body
+          >
+            <template slot="title">
+              <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title">
+              <span
+                style="
+                  display: inline-block;
+                  width: 3px;
+                  height: 20px;
+                  margin-right: 5px;
+                  float: left;
+                  margin-top: 2px;
+                "
+              ></span>
+            </span>
+              </div>
+            </template>
+            <div>配置排序列数据（拖动调整顺序）</div>
+            <div style="margin-left: 17px">
+              <el-checkbox
+                v-model="allCheck3"
+                label="全选"
+                @change="allChecked3"
+              ></el-checkbox>
+            </div>
+            <div style="padding: 4px; display: flex; justify-content: center">
+              <draggable
+                v-model="setRowList3"
+                group="site"
+                animation="300"
+                @start="onStart"
+                @end="onEnd"
+                handle=".indraggable"
+              >
+                <transition-group>
+                  <div
+                    v-for="item in setRowList3"
+                    :key="item.surface"
+                    class="listStyle"
+                  >
+                    <div style="width: 500px" class="indraggable">
+                      <div class="progress" :style="{ width: item.width + 'px' }">
+                        <el-checkbox
+                          :label="item.name"
+                          v-model="item.checked"
+                          :true-label="0"
+                          :false-label="1"
+                        >{{ item.name }}
+                        </el-checkbox>
+                      </div>
+                    </div>
+                    <el-input-number
+                      v-model.number="item.width"
+                      controls-position="right"
+                      :min="1"
+                      :max="500"
+                      size="mini"
+                    ></el-input-number>
+                  </div>
+                </transition-group>
+              </draggable>
+            </div>
+            <span slot="footer" class="dialog-footer">
+          <el-button @click="showSetting3 = false">取 消</el-button>
+          <el-button @click="delRow3" type="danger">重 置</el-button>
+          <el-button type="primary" @click="save3()">确 定</el-button>
+        </span>
+          </el-dialog>
           <el-table
             v-loading="loading"
             :data="feeList"
@@ -989,91 +1073,142 @@
             <!-- <el-table-column label="制单部门" align="center" prop="fId" /> -->
             <el-table-column label="行号" align="center" type="index" />
             <el-table-column
-              label="货权方"
-              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 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 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>
-                <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
-                <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
-                <span v-else-if="scope.row.fBilltype == 'JSCCF'">仓储费</span>
-                <span v-else-if="scope.row.fBilltype == '1000'">计划下达</span>
-                <span v-else-if="scope.row.fBilltype == '1010'">业务调度</span>
-                <span v-else-if="scope.row.fBilltype == '1020'">车队派车</span>
-                <span v-else-if="scope.row.fBilltype == '1030'">司机接单</span>
-                <span v-else-if="scope.row.fBilltype == '1080'">司机出车</span>
-                <span v-else-if="scope.row.fBilltype == '1040'">司机提箱</span>
-                <span v-else-if="scope.row.fBilltype == '1050'"
-                >司机装卸柜</span
-                >
-                <span v-else-if="scope.row.fBilltype == '1060'"
-                >司机还卸柜</span
-                >
-                <span v-else-if="scope.row.fBilltype == '1070'">司机回单</span>
-                <span v-else-if="scope.row.fBilltype == '1090'">费用补充</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              label="作业类型"
+              v-for="(item, index) in getRowList3"
+              :key="index"
+              :label="item.name"
+              :width="item.width"
+              :prop="item.label"
               align="center"
-              prop="fBusinessType"
-            />
-            <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
-            <el-table-column
-              label="审核日期"
-              align="center"
-              prop="fReviewDate"
-            />
-            <el-table-column label="金额" align="center" prop="fAmtdr" />
-            <el-table-column
-              label="本次金额"
-              align="center"
-              prop="fAmt"
-              width="100"
+              :fixed="item.fixed"
+              :show-overflow-tooltip="true"
+              sortable
             >
               <template slot-scope="scope">
+                <span v-if="item.label == 'fName'">{{scope.row.fName}}</span>
+                <span v-if="item.label == 'fFeesName'">{{scope.row.fFeesName}}</span>
+                <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
+                <span v-if="item.label == 'fProductName'">{{scope.row.fProductName}}</span>
+                <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fBsdate}}</span>
+                <span v-if="item.label == 'fBilltype'">
+                  <template>
+                    <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
+                    <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
+                    <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>
+                    <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>
+                    <span v-else-if="scope.row.fBilltype == 'JSCCF'">仓储费</span>
+                    <span v-else-if="scope.row.fBilltype == '1000'">计划下达</span>
+                    <span v-else-if="scope.row.fBilltype == '1010'">业务调度</span>
+                    <span v-else-if="scope.row.fBilltype == '1020'">车队派车</span>
+                    <span v-else-if="scope.row.fBilltype == '1030'">司机接单</span>
+                    <span v-else-if="scope.row.fBilltype == '1080'">司机出车</span>
+                    <span v-else-if="scope.row.fBilltype == '1040'">司机提箱</span>
+                    <span v-else-if="scope.row.fBilltype == '1050'"
+                    >司机装卸柜</span
+                    >
+                    <span v-else-if="scope.row.fBilltype == '1060'"
+                    >司机还卸柜</span
+                    >
+                    <span v-else-if="scope.row.fBilltype == '1070'">司机回单</span>
+                    <span v-else-if="scope.row.fBilltype == '1090'">费用补充</span>
+                  </template>
+                </span>
+                <span v-if="item.label == 'fBusinessType'">{{scope.row.fBusinessType}}</span>
+                <span v-if="item.label == 'fReviewDate'">{{scope.row.fReviewDate}}</span>
+                <span v-if="item.label == 'fAmtdr'">{{scope.row.fAmtdr}}</span>
                 <el-input
                   v-model="scope.row.fAmt"
-                  placeholder="请输入本次金额"
-                  clearable
-                  size="small"
+                  v-if="item.label == 'fAmt'"
                   oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
                   @change="imgChangeI(scope.row)"
                 />
+                <span v-if="item.label == 'fFeeName'">{{scope.row.fFeeName}}</span>
+                <el-input v-model="scope.row.fRemarks" v-if="item.label == 'fRemarks'"/>
               </template>
             </el-table-column>
-            <el-table-column label="费用名称" align="center" prop="fFeeName" />
-            <el-table-column label="备注" align="center" prop="fRemarks">
-              <template slot-scope="scope">
-                <el-input
-                  v-model="scope.row.fRemarks"
-                  placeholder="请输入备注"
-                  clearable
-                  size="small"
-                  width="100"
-                />
-              </template>
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              label="货权方"-->
+<!--              align="center"-->
+<!--              prop="fName"-->
+<!--              width="200px"-->
+<!--            />-->
+<!--            <el-table-column-->
+<!--              label="结算单位"-->
+<!--              align="center"-->
+<!--              prop="fFeesName"-->
+<!--              width="200px"-->
+<!--            />-->
+<!--            &lt;!&ndash; <el-table-column label="账单日期" align="center" prop="fAccbilldate"/> &ndash;&gt;-->
+<!--            <el-table-column label="提单号" align="center" prop="fMblno" />-->
+<!--            <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 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>-->
+<!--                <span v-else-if="scope.row.fBilltype == 'CKDB'">调拨</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == 'HQZY'">货权转移</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == 'JSCCF'">仓储费</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1000'">计划下达</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1010'">业务调度</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1020'">车队派车</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1030'">司机接单</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1080'">司机出车</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1040'">司机提箱</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1050'"-->
+<!--                >司机装卸柜</span-->
+<!--                >-->
+<!--                <span v-else-if="scope.row.fBilltype == '1060'"-->
+<!--                >司机还卸柜</span-->
+<!--                >-->
+<!--                <span v-else-if="scope.row.fBilltype == '1070'">司机回单</span>-->
+<!--                <span v-else-if="scope.row.fBilltype == '1090'">费用补充</span>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column-->
+<!--              label="作业类型"-->
+<!--              align="center"-->
+<!--              prop="fBusinessType"-->
+<!--            />-->
+<!--            &lt;!&ndash;       <el-table-column label="单据类型" align="center" prop="fBilltype" />&ndash;&gt;-->
+<!--            <el-table-column-->
+<!--              label="审核日期"-->
+<!--              align="center"-->
+<!--              prop="fReviewDate"-->
+<!--            />-->
+<!--            <el-table-column label="金额" align="center" prop="fAmtdr" />-->
+<!--            <el-table-column-->
+<!--              label="本次金额"-->
+<!--              align="center"-->
+<!--              prop="fAmt"-->
+<!--              width="100"-->
+<!--            >-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-input-->
+<!--                  v-model="scope.row.fAmt"-->
+<!--                  placeholder="请输入本次金额"-->
+<!--                  clearable-->
+<!--                  size="small"-->
+<!--                  oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--                  @change="imgChangeI(scope.row)"-->
+<!--                />-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column label="费用名称" align="center" prop="fFeeName" />-->
+<!--            <el-table-column label="备注" align="center" prop="fRemarks">-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-input-->
+<!--                  v-model="scope.row.fRemarks"-->
+<!--                  placeholder="请输入备注"-->
+<!--                  clearable-->
+<!--                  size="small"-->
+<!--                  width="100"-->
+<!--                />-->
+<!--              </template>-->
+<!--            </el-table-column>-->
           </el-table>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -1444,68 +1579,147 @@ export default {
         },
         {
           surface: "13",
-          label: "fMblno",
-          name: "提单号",
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "14",
           label: "fProductName",
           name: "货物品名",
           checked: 0,
           width: 100,
         },
         {
-          surface: "15",
+          surface: "14",
           label: "fMarks",
           name: "品牌",
           checked: 0,
           width: 100,
         },
         {
-          surface: "16",
+          surface: "15",
           label: "fChargedate",
           name: "计费起始日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "17",
+          surface: "16",
           label: "fBillingDeadline",
           name: "计费截止日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "17",
           label: "fBillingDays",
           name: "计费天数",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "18",
           label: "fInventoryDays",
           name: "库存天数",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "19",
           label: "fRemarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
         {
-          surface: "21",
+          surface: "20",
           label: "carLoadDate",
           name: "提箱日期",
           checked: 0,
           width: 100,
         },
       ],
+      tableDate3: [
+        {
+          surface: "1",
+          label: "fName",
+          name: "货权方",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "fFeesName",
+          name: "结算单位",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
+          label: "fMblno",
+          name: "提单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "4",
+          label: "fProductName",
+          name: "品名",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "5",
+          label: "fBsdate",
+          name: "业务日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "6",
+          label: "fBilltype",
+          name: "业务类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "7",
+          label: "fBusinessType",
+          name: "作业类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "fReviewDate",
+          name: "审核日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fAmtdr",
+          name: "金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "fAmt",
+          name: "本次金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "fFeeName",
+          name: "费用名称",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "12",
+          label: "fRemarks",
+          name: "备注",
+          checked: 0,
+          width: 100,
+        },
+      ],
       setRowList: [],
       getRowList: [],
       allCheck: false,
@@ -1514,6 +1728,10 @@ export default {
       getRowList2: [],
       allCheck2: false,
       showSetting2: false,
+      setRowList3: [],
+      getRowList3: [],
+      allCheck3: false,
+      showSetting3: false,
       //控制结算单位是否可操作
       doNot: false,
       jFeetunitOptions: [],
@@ -1621,6 +1839,7 @@ export default {
         fDeptid: null,
         createBy: null,
         timeReconci: null,
+        fSystemType:Cookies.get("sysType")
       },
       // 主表查询参数
       tablefilter: {
@@ -1665,6 +1884,8 @@ export default {
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
     this.getRowList2 = this.tableDate2;
+    this.setRowList3 = this.tableDate3;
+    this.getRowList3 = this.tableDate3;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -1676,6 +1897,8 @@ export default {
     });
     this.getRow();
     this.getRow2();
+    // this.getRow3();
+    this.corpsRemoteMethod()
   },
   activated() {
     if(this.$route.query.data){
@@ -1825,6 +2048,68 @@ export default {
         }
       });
     },
+    //列设置全选
+    allChecked3() {
+      if (this.allCheck3 == true) {
+        this.setRowList3.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList3.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow3() {
+      let that = this;
+      this.data = {
+        tableName: "_弹窗对账明细",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList3 = res.data.filter((e) => e.checked == 0);
+          this.setRowList3 = res.data;
+          this.setRowList3 = this.setRowList3.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+    //保存列设置
+    save3() {
+      this.showSetting3 = false;
+      this.data = {
+        tableName: "_弹窗对账明细",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList3,
+      };
+      addSet(this.data).then((res) => {
+        this.getRowList3 = this.setRowList3.filter((e) => e.checked == 0);
+      });
+    },
+    //重置列表
+    delRow3() {
+      this.data = {
+        tableName: "_弹窗对账明细",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting3 = false;
+          this.setRowList3 = this.getRowList3 = this.$options.data().tableDate3
+        }
+      });
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true;
@@ -3133,9 +3418,9 @@ export default {
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
+      // if (name == null || name === "") {
+      //   return false;
+      // }
       let queryParams = { fName: name };
       listCorps(queryParams).then((response) => {
         this.fMblnoOptions = response;
@@ -3420,3 +3705,8 @@ export default {
   content: "\e719";
 }
 </style>
+<style lang="scss">
+.el-dialog__body{
+  padding: 0 20px 30px 20px;
+}
+</style>

src/views/finance/payment/index.vue

@@ -767,14 +767,14 @@
         v-dialogDrag
         :fullscreen="dialogFull"
         :close-on-click-modal="false"
-        width="70%"
+        width="78%"
         :visible.sync="innerVisible"
         title="导入数据"
         append-to-body
       >
         <template slot="title">
           <div class="avue-crud__dialog__header">
-            <span class="el-dialog__title">
+            <span class="el-dialog__title" style="font-size: 18px;font-weight: bold;color: #606266;">
               <span
                 style="
                   display: inline-block;
@@ -785,7 +785,7 @@
                   margin-top: 2px;
                 "
               ></span>
-              导入数据
+              检索
             </span>
             <div class="avue-crud__dialog__menu enlarge" @click="full">
               <i
@@ -983,23 +983,102 @@
             </el-col>
             <el-col :span="8" style="width: 320px">
               <el-form-item>
-            <el-button
-              type="cyan"
-              icon="el-icon-search"
-              size="mini"
-              @click="importSearch"
-            >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s"
-            >重置</el-button
-            >
           </el-form-item>
             </el-col>
-
           </el-row>
-
-
         </el-form>
+        <el-dialog
+          title="自定义列显示"
+          :visible.sync="showSetting3"
+          width="700px"
+          v-dialogDrag
+          append-to-body
+        >
+          <template slot="title">
+            <div class="avue-crud__dialog__header">
+            <span class="el-dialog__title">
+              <span
+                style="
+                  display: inline-block;
+                  width: 3px;
+                  height: 20px;
+                  margin-right: 5px;
+                  float: left;
+                  margin-top: 2px;
+                "
+              ></span>
+            </span>
+            </div>
+          </template>
+          <div>配置排序列数据（拖动调整顺序）</div>
+          <div style="margin-left: 17px">
+            <el-checkbox
+              v-model="allCheck3"
+              label="全选"
+              @change="allChecked3"
+            ></el-checkbox>
+          </div>
+          <div style="padding: 4px; display: flex; justify-content: center">
+            <draggable
+              v-model="setRowList3"
+              group="site"
+              animation="300"
+              @start="onStart"
+              @end="onEnd"
+              handle=".indraggable"
+            >
+              <transition-group>
+                <div
+                  v-for="item in setRowList3"
+                  :key="item.surface"
+                  class="listStyle"
+                >
+                  <div style="width: 500px" class="indraggable">
+                    <div class="progress" :style="{ width: item.width + 'px' }">
+                      <el-checkbox
+                        :label="item.name"
+                        v-model="item.checked"
+                        :true-label="0"
+                        :false-label="1"
+                      >{{ item.name }}
+                      </el-checkbox>
+                    </div>
+                  </div>
+                  <el-input-number
+                    v-model.number="item.width"
+                    controls-position="right"
+                    :min="1"
+                    :max="500"
+                    size="mini"
+                  ></el-input-number>
+                </div>
+              </transition-group>
+            </draggable>
+          </div>
+          <span slot="footer" class="dialog-footer">
+          <el-button @click="showSetting3 = false">取 消</el-button>
+          <el-button @click="delRow3" type="danger">重 置</el-button>
+          <el-button type="primary" @click="save3()">确 定</el-button>
+        </span>
+        </el-dialog>
+        <div style="margin-right: 20px;float: right">
+          <el-button
+            type="cyan"
+            icon="el-icon-search"
+            size="mini"
+            @click="importSearch"
+          >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery_s"
+          >重置</el-button
+          >
+          <el-button
+            icon="el-icon-setting"
+            size="mini"
+            circle
+            @click="showSetting3 = !showSetting3"
+          ></el-button>
+        </div>
         <el-table
           v-loading="loading"
           :data="chargeList_s"
@@ -1009,63 +1088,87 @@
           @selection-change="handleSelectionChange_s"
         >
           <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="序号" type="index" width="55" align="center"/>
           <el-table-column
-            label="序号"
-            type="index"
-            width="55"
-            align="center"
-          />
-          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip/>
-          <el-table-column label="提单号" align="center" prop="fMblno" />
-          <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">
-            <template slot-scope="scope">
-              <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>
-              <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>
-              <span v-else>{{ scope.row.fBilltype }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="作业类型"
-            align="center"
-            prop="fBusinessType"
-          />
-          <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="本次金额"
+            v-for="(item, index) in getRowList3"
+            :key="index"
+            :label="item.name"
+            :width="item.width"
+            :prop="item.label"
             align="center"
-            prop="fAmt"
-            width="100"
+            :fixed="item.fixed"
+            :show-overflow-tooltip="true"
+            sortable
           >
             <template slot-scope="scope">
+              <span v-if="item.label == 'fName'">{{scope.row.fName}}</span>
+              <span v-if="item.label == 'fMblno'">{{scope.row.fMblno}}</span>
+              <span v-if="item.label == 'fProductName'">{{scope.row.fProductName}}</span>
+              <span v-if="item.label == 'fBsdate'">{{scope.row.fBsdate ? scope.row.fBsdate.slice(0, 10) : scope.row.fBsdate}}</span>
+              <span v-if="item.label == 'fBilltype'">{{scope.row.fBilltype}}</span>
+              <span v-if="item.label == 'fBusinessType'">{{scope.row.fBusinessType}}</span>
+              <span v-if="item.label == 'fReviewDate'">{{scope.row.fReviewDate}}</span>
+              <span v-if="item.label == 'fFeeName'">{{scope.row.fFeeName}}</span>
+              <span v-if="item.label == 'fAmtdr'">{{scope.row.fAmtdr}}</span>
               <el-input
                 v-model="scope.row.fAmt"
-                placeholder="请输入本次金额"
-                clearable
-                size="small"
+                v-if="item.label == 'fAmt'"
                 oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-                @change="imgChangeI(scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" align="center" prop="fRemarks">
-            <template slot-scope="scope">
-              <el-input
-                v-model="scope.row.fRemarks"
-                placeholder="请输入备注"
-                clearable
-                size="small"
-                width="100"
-              />
+                @change="imgChangeI(scope.row)" />
+                <el-input v-model="scope.row.fRemarks" v-if="item.label == 'fRemarks'"/>
             </template>
           </el-table-column>
+                <!--          <el-table-column label="货权方" align="center" prop="fName" width="200px" show-overflow-tooltip/>-->
+<!--          <el-table-column label="提单号" align="center" prop="fMblno" />-->
+<!--          <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">-->
+<!--            <template slot-scope="scope">-->
+<!--              <span v-if="scope.row.fBilltype == 'SJRK'">入库</span>-->
+<!--              <span v-else-if="scope.row.fBilltype == 'SJCK'">出库</span>-->
+<!--              <span v-else>{{ scope.row.fBilltype }}</span>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="作业类型"-->
+<!--            align="center"-->
+<!--            prop="fBusinessType"-->
+<!--          />-->
+<!--          <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="本次金额"-->
+<!--            align="center"-->
+<!--            prop="fAmt"-->
+<!--            width="100"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fAmt"-->
+<!--                placeholder="请输入本次金额"-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--                @change="imgChangeI(scope.row)"-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column label="备注" align="center" prop="fRemarks">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-input-->
+<!--                v-model="scope.row.fRemarks"-->
+<!--                placeholder="请输入备注"-->
+<!--                clearable-->
+<!--                size="small"-->
+<!--                width="100"-->
+<!--              />-->
+<!--            </template>-->
+<!--          </el-table-column>-->
         </el-table>
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="confirmImport">确 定</el-button>
@@ -2123,10 +2226,93 @@ export default {
           width: 100,
         },
       ],
+      tableDate3: [
+        {
+          surface: "1",
+          label: "fName",
+          name: "货权方",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "fMblno",
+          name: "提单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "3",
+          label: "fProductName",
+          name: "品名",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "4",
+          label: "fBsdate",
+          name: "业务日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "5",
+          label: "fBilltype",
+          name: "业务类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "6",
+          label: "fBusinessType",
+          name: "作业类型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "7",
+          label: "fReviewDate",
+          name: "审核日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "fFeeName",
+          name: "费用名称",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fAmtdr",
+          name: "金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "fAmt",
+          name: "本次金额",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "fRemarks",
+          name: "备注",
+          checked: 0,
+          width: 100,
+        },
+      ],
       setRowList2: [],
       getRowList2: [],
       allCheck2: false,
       showSetting2: false,
+      setRowList3: [],
+      getRowList3: [],
+      allCheck3: false,
+      showSetting3: false,
       typevalue: "",
       typeoptions: [
         {
@@ -2281,6 +2467,8 @@ export default {
     this.getRowList = this.tableDate;
     this.setRowList2 = this.tableDate2;
     this.getRowList2 = this.tableDate2;
+    this.setRowList3 = this.tableDate3;
+    this.getRowList3 = this.tableDate3;
     this.typevalue = Cookies.get("sysType");
     this.getList();
     this.register();
@@ -2293,6 +2481,8 @@ export default {
     });
     this.getRow();
     this.getRow2();
+    this.getRow3();
+    this.corpsRemoteMethod()
   },
   activated() {
     if(this.$route.query.data){
@@ -2462,6 +2652,68 @@ export default {
         }
       });
     },
+    //列设置全选
+    allChecked3() {
+      if (this.allCheck3 == true) {
+        this.setRowList3.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList3.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow3() {
+      let that = this;
+      this.data = {
+        tableName: "付费弹窗",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList3 = res.data.filter((e) => e.checked == 0);
+          this.setRowList3 = res.data;
+          this.setRowList3 = this.setRowList3.reduce((res, item) => {
+            res.push({
+              surface: item.surface,
+              label: item.label,
+              name: item.name,
+              checked: item.checked,
+              width: item.width,
+              fixed: item.fixed,
+            });
+            return res;
+          }, []);
+        }
+      });
+    },
+    //保存列设置
+    save3() {
+      this.showSetting3 = false;
+      this.data = {
+        tableName: "付费弹窗",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList3,
+      };
+      addSet(this.data).then((res) => {
+        this.getRowList3 = this.setRowList3.filter((e) => e.checked == 0);
+      });
+    },
+    //重置列表
+    delRow3() {
+      this.data = {
+        tableName: "付费弹窗",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting3 = false;
+          this.setRowList3 = this.getRowList3 = this.$options.data().tableDate3
+        }
+      });
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true;
@@ -3517,9 +3769,9 @@ export default {
     },
     /** 远程模糊查询用户 */
     corpsRemoteMethod(name) {
-      if (name == null || name === "") {
-        return false;
-      }
+      // if (name == null || name === "") {
+      //   return false;
+      // }
       let queryParams = { fName: name };
       listCorps(queryParams).then((response) => {
         this.fMblnoOptions = response;
@@ -3948,3 +4200,8 @@ export default {
   content: "\e719";
 }
 </style>
+<style lang="scss">
+.el-dialog__body{
+  padding: 0 20px 30px 20px;
+}
+</style>

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

@@ -188,7 +188,7 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
+            @click="handleUpdate(scope.row,1)"
             v-hasPermi="['warehouse:warehousebills:webVersionOrderDetails']"
           >查看</el-button>
 <!--          <el-button-->
@@ -588,11 +588,12 @@
       },
 
       //查看跳转
-      handleUpdate(row){
+      handleUpdate(row,num){
         console.log(row.fId)
         let res = {}
         res = {
-          fId:row.fId
+          fId:row.fId,
+          num:num
         }
         this.$router.push({
           path: "/domesticTrade/orderInformation",
@@ -609,7 +610,6 @@
       },
       /** 查询客户详情列表 */
       getList() {
-        console.log(this.queryParams)
         listCorps(this.queryParams).then(response => {
           console.log(response)
           this.corpsList = response.rows;

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

@@ -1095,11 +1095,11 @@
     <div style="margin:60px;float: right">
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
       <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
-      <el-button type="info" v-if="this.form.fBillstatus == 11" @click="modify = false">修 改</el-button>
-      <el-button type="success" v-if="this.form.fBillstatus == 11" @click="approval">保 存</el-button>
+      <el-button type="info" :disabled="jumpDonot" v-if="this.form.fBillstatus == 11" @click="modify = false">修 改</el-button>
+      <el-button type="success" :disabled="modify" v-if="this.form.fBillstatus == 11" @click="approval">保 存</el-button>
       <el-button type="primary" :disabled="modify" v-if="this.form.fBillstatus == 11" @click="feeSubmission">费用请核</el-button>
       <el-button type="success" v-if="approVal" @click="addOrUpdateHand(form)">审 批</el-button>
-      <el-button type="danger" v-if="form.moneyStatus === 4 && current == before" @click="revokeTwo">撤销请核</el-button>
+      <el-button type="danger" :disabled="disappear" v-if="form.moneyStatus === 4 && current == before" @click="revokeTwo">撤销请核</el-button>
       <el-button type="primary" v-if="this.form.fBillstatus != 11 || this.form.moneyStatus != null && this.form.moneyStatus != 6"@click="addOrUpdateHandle(form)">查看审批</el-button>
     </div>
 <!--    附件查看-->
@@ -1272,6 +1272,8 @@ export default {
   },
   data() {
     return {
+      jumpDonot:false,
+      disappear:false,
       businessTypeOptions:[],
       id:null,
       current: "",
@@ -1342,22 +1344,36 @@ export default {
       row: [],
       res:[]
     }
+    formList:{}
   },
   //页面跳转后传递参数
   activated() {
     let formDate
     if (this.$route.query.list){
+      console.log("111")
       formDate = {
         fId: JSON.parse(this.$route.query.list).billId
       }
-      console.log(JSON.parse(this.$route.query.list))
+      this.formList = formDate
       this.approVal = true;
     }else if(this.$route.query.data){
-      formDate = JSON.parse(this.$route.query.data)
-      this.id = JSON.parse(this.$route.query.data)
+      console.log("222")
+      console.log(JSON.parse(this.$route.query.data))
+      formDate = {
+        fId:JSON.parse(this.$route.query.data).fId,
+        num:JSON.parse(this.$route.query.data).num
+      }
+      console.log(formDate.num)
+      this.id = formDate.fId
+      this.formList = formDate.fId
       this.approVal = false;
     }
-
+    if(formDate.num){
+      this.jumpDonot = false
+    }else{
+      this.jumpDonot = true
+    }
+    console.log(formDate.fId)
     if (formDate) {
       addmodify(formDate).then(response => {
         console.log(response)
@@ -1390,6 +1406,8 @@ export default {
             this.$set(this.warehouseCrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseCrList[item].fFeeunitid))
           }
         }
+        if(this.current == this.before)
+        this.disappear = true;
       })
     }
   },
@@ -1444,7 +1462,42 @@ export default {
       revokeTwo(data).then((data) => {
         if (data.code === 200) {
           this.msgSuccess("撤销成功");
-          this.$router.push({path: "/domesticTrade/orderInformation"})
+          if (this.formList) {
+            addmodify(this.formList).then(response => {
+              console.log(response)
+              this.form = response.rows[0]
+              let data = {
+                actId:460,
+                id:this.form.fId
+              }
+              getName(data).then(response=>{
+                if(response.data.length != 0){
+                  this.before = response.data[0].userName
+                }
+              })
+              queryUserVal().then((response) => {
+                this.current = response.user.userName;
+              });
+              this.goodsList = response.rows[0].tWarehousebillsCntrList
+              this.estimatedTime = response.rows[0].tVoyageL
+              this.dataList = response.rows[0].tWarehousebillsCntritemsList
+              this.loading = false
+              if (response.rows[0].tWarehousebillsfeesDr) {
+                this.warehouseDrList = response.rows[0].tWarehousebillsfeesDr
+                for (let item in this.warehouseDrList) {
+                  this.$set(this.warehouseDrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseDrList[item].fFeeunitid))
+                }
+              }
+              if (response.rows[0].warehousebillsfeesCr) {
+                this.warehouseCrList = response.rows[0].warehousebillsfeesCr
+                for (let item in this.warehouseCrList) {
+                  this.$set(this.warehouseCrList[item], 'fFeeUnitid', JSON.stringify(this.warehouseCrList[item].fFeeunitid))
+                }
+              }
+              // if(this.current == this.before)
+              //   this.disappear = false;
+            })
+          }
           this.reset();
         }
       });
@@ -1509,6 +1562,20 @@ export default {
         console.log(response)
         this.$message.success("操作成功")
         this.modify = true
+        this.form.moneyStatus = 4
+        this.form.fBillstatus = 12
+        let data = {
+          actId:460,
+          id:this.form.fId
+        }
+        getName(data).then(response=>{
+          if(response.data.length != 0){
+            this.before = response.data[0].userName
+            if (this.current == this.before) {
+              this.disappear = false;
+            }
+          }
+        })
       })
     },
     cntrWeight(res){