修改车队

src/api/morePage/stock.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+// 列表页
+export function selectAuditItems(query) {
+    return request({
+        url: '/warehouse/paths/selectAuditItems',
+        method: 'get',
+        params: query
+    })
+}
+// 总条数
+export function selectAuditItemsTotal(query) {
+    return request({
+        url: '/warehouse/paths/selectCountAuditItems',
+        method: 'get',
+        params: query
+    })
+}

src/views/morePage/stock/index.vue

@@ -9,16 +9,16 @@
     >
       <el-row>
         <el-col :span="6">
-          <el-form-item label="客户名称" prop="corpId">
+          <el-form-item label="客户名称" prop="refno1">
             <el-select
-              v-model="queryParams.corpId"
+              v-model="queryParams.refno1"
               placeholder="请输入客户名称"
               clearable
               size="small"
               filterable
             >
               <el-option
-                v-for="(dict, index) in fMblnoOptions"
+                v-for="(dict, index) in factIdOptions"
                 :key="index.fId"
                 :label="dict.fName"
                 :value="dict.fId"
@@ -26,9 +26,9 @@
             </el-select> </el-form-item
         ></el-col>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="业务类型" prop="billType">
+          <el-form-item label-width="100px" label="业务类型" prop="rbillId">
             <el-select
-              v-model="queryParams.billType"
+              v-model="queryParams.rbillId"
               placeholder="请选择业务类型"
               clearable
               size="small"
@@ -38,9 +38,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="提单号" prop="mblno">
+          <el-form-item label-width="100px" label="提单号" prop="actId">
             <el-input
-              v-model="queryParams.mblno"
+              v-model="queryParams.actId"
               placeholder="请输入提单号"
               clearable
               size="small"
@@ -50,9 +50,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label-width="100px" label="系统编号" prop="fBillno">
+          <el-form-item label-width="100px" label="系统编号" prop="billNo">
             <el-input
-              v-model="queryParams.fBillno"
+              v-model="queryParams.billNo"
               placeholder="请输入系统编号"
               clearable
               size="small"
@@ -66,9 +66,13 @@
         <div v-show="show">
           <el-row>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="请核人" prop="transProp">
+              <el-form-item
+                label-width="100px"
+                label="请核人"
+                prop="sendUserId"
+              >
                 <el-select
-                  v-model="queryParams.transProp"
+                  v-model="queryParams.sendUserId"
                   placeholder="请选择请核人"
                   clearable
                   size="small"
@@ -78,9 +82,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label-width="100px" label="审核人" prop="goodsId">
+              <el-form-item
+                label-width="100px"
+                label="审核人"
+                prop="auditUserId"
+              >
                 <el-select
-                  v-model="queryParams.goodsId"
+                  v-model="queryParams.auditUserId"
                   placeholder="请输入审核人"
                   clearable
                   size="small"
@@ -93,10 +101,10 @@
               <el-form-item
                 label-width="100px"
                 label="提交日期"
-                prop="loadAddr"
+                prop="sendTime"
               >
                 <el-date-picker
-                  v-model="queryParams.loadAddr"
+                  v-model="queryParams.sendTime"
                   size="small"
                   @keyup.enter.native="handleQuery"
                   style="max-width: 187px"
@@ -113,10 +121,10 @@
               <el-form-item
                 label-width="100px"
                 label="业务日期"
-                prop="mdLoadAddr"
+                prop="billTime"
               >
                 <el-date-picker
-                  v-model="queryParams.mdLoadAddr"
+                  v-model="queryParams.billTime"
                   placeholder="请输入业务日期"
                   clearable
                   size="small"
@@ -132,10 +140,10 @@
               ><el-form-item
                 label-width="100px"
                 label="审核日期"
-                prop="unLoadAddr"
+                prop="auditOpTime"
               >
                 <el-date-picker
-                  v-model="queryParams.unLoadAddr"
+                  v-model="queryParams.auditOpTime"
                   placeholder="请输入审核日期"
                   clearable
                   size="small"
@@ -211,12 +219,75 @@
         </div>
       </div>
     </el-row>
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+      <div>配置排序列数据（拖动调整顺序）</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck"
+          label="全选"
+          @change="allChecked"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList"
+              :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="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save()">确 定</el-button>
+      </span>
+    </el-dialog>
     <el-table
       v-loading="loading"
-      :data="tableData"
+      :data="selectAuditList"
       :header-cell-style="{ borderBottom: '1px dashed #dfe6ec' }"
     >
       <el-table-column
+        v-for="(item, index) in getRowList"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :fixed="item.fixed"
+        :show-overflow-tooltip="true"
+        sortable
+      />
+      <!-- <el-table-column
         prop="refno1"
         :show-overflow-tooltip="true"
         label="委托方"
@@ -279,7 +350,7 @@
       <el-table-column
         :show-overflow-tooltip="true"
         label="提交日期"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column label="操作" width="80">
         <template slot-scope="scope">
           <span style="cursor: pointer" @click="approval(scope.row)"
@@ -317,57 +388,286 @@
 </template>
 
 <script>
-import { inquiry } from "@/api/index";
+import { selectAuditItems, selectAuditItemsTotal } from "@/api/morePage/stock";
 import { listCorps } from "@/api/basicdata/corps";
+import { addSet, select, resetModule } from "@/api/system/set";
+import Cookies from "js-cookie";
+import draggable from "vuedraggable";
+
 export default {
   name: "index",
+  components: {draggable},
   data() {
     return {
-      tableData: [],
+      selectAuditList: [],
       dialogVisible: false,
       total: 0,
       text: "",
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        corpId: null,
-        billType: null,
-        fBillno: null,
-        transProp: null,
-        goodsId: null,
-        mblno: null,
-        loadAddr: null,
-        mdLoadAddr: null,
-        unLoadAddr: null,
+        refno1: null,
+        rbillId: null,
+        billNo: null,
+        sendUserId: null,
+        auditUserId: null,
+        actId: null,
+        sendTime: null,
+        billTime: null,
+        auditOpTime: null,
       },
       show: false,
       showSearch: true,
-      fMblnoOptions: [],
+      factIdOptions: [],
+      showSetting: false,
+      drag: false,
+      setRowList: [],
+      getRowList: [],
+      tableDate: [
+        {
+          surface: "1",
+          label: "refno1",
+          name: "委托方",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "billTime",
+          name: "日期",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "3",
+          label: "refno3",
+          name: "提单号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "4",
+          label: "refno2",
+          name: "业务类型",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "5",
+          label: "fAmount",
+          name: "出入库费",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "6",
+          label: "billNo",
+          name: "系统编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "7",
+          label: "audit",
+          name: "审核状态",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "8",
+          label: "auditUserName",
+          name: "审核人",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "9",
+          label: "auditOpTime",
+          name: "审核日期",
+          checked: 0,
+          width: 150,
+        },
+        {
+          surface: "10",
+          label: "isAccountPeriod",
+          name: "提交人",
+          checked: 0,
+          width: 150,
+        },
+        {
+          surface: "11",
+          label: "sendTime",
+          name: "提交日期",
+          checked: 0,
+          width: 150,
+        },
+      ],
+      allCheck: false,
     };
   },
   created() {
-    this.getList();
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     listCorps().then((response) => {
-      this.fMblnoOptions = response.rows;
+      this.factIdOptions = response.rows;
     });
+    this.getList();
+    this.getRow();
   },
   methods: {
+    //列设置全选
+    allChecked() {
+      if (this.allCheck == true) {
+        this.setRowList.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow() {
+      let that = this;
+      this.data = {
+        tableName: "我的审核",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList = res.data.filter((e) => e.checked == 0);
+          this.setRowList = res.data;
+          this.setRowList = this.setRowList.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;
+          }, []);
+        }
+      });
+    },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "我的审核",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
+    //保存列设置
+    save() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "我的审核",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList,
+      };
+      addSet(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        }
+      });
+    },
+    //开始拖拽事件
+    onStart() {
+      this.drag = true;
+    },
+    //拖拽结束事件
+    onEnd() {
+      this.drag = false;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.getList(this.queryParams);
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.resetForm("queryForm");
       this.handleQuery();
     },
     getList() {
       this.loading = true;
-      let data = {
-        actId: "",
-      };
-      inquiry(data).then((res) => {
-        this.tableData = res.data;
+      selectAuditItems(this.queryParams).then((response) => {
+        response.data.map((e) => {
+          if (e.sendTime) {
+            e.sendTime = e.sendTime.slice(0, 10);
+          }
+          if (e.refno2) {
+            switch (e.refno2) {
+              case "SJRK": {
+                e.refno2="入库"
+                break;
+              }
+              case "SJCK": {
+                e.refno2="出库"
+                break;
+              }
+              case "HQZY": {
+               e.refno2="货转"
+                break;
+              }
+              case "CKDB": {
+                e.refno2="调拨"
+                break;
+              }
+              case "HWTG": {
+                e.refno2="货物通关"
+                break;
+              }
+              case "JSCCF": {
+                e.refno2="计算仓储费"
+                break;
+              }
+              case "CCF": {
+                e.refno2="仓储费"
+                break;
+              }
+              case "ZYF": {
+               e.refno2="作业费"
+                break;
+              }
+              case "SF": {
+               e.refno2="收费"
+                break;
+              }
+              case "DZ": {
+               e.refno2="对账"
+                break;
+              }
+              case "FF": {
+                e.refno2="付费"
+                break;
+              }
+              case "SE": {
+               e.refno2="下单配船"
+                break;
+              }
+              default: {
+                return this.$message.error("未知错误，无状态");
+              }
+            }
+          }
+        });
+        this.selectAuditList = response.data;
+        selectAuditItemsTotal().then((res) => {
+          if (res.code == 200) {
+            this.total = res.data;
+          }
+        });
         this.loading = false;
       });
     },

src/views/track/cabinet/AddOrUpdate.vue

@@ -683,7 +683,9 @@
                   filterable
                   size="mini"
                   style="width: 160px"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                 >
                   <el-option
                     v-for="(dict, index) in allfMblnoOptions"
@@ -706,7 +708,9 @@
                   filterable
                   remote
                   placeholder="费用名称"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                 >
                   <el-option
                     v-for="(dict, index) in fWbuOptions"
@@ -722,7 +726,9 @@
                 <el-select
                   v-model="scope.row.fDc"
                   placeholder="请选择"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                 >
                   <el-option label="收" value="D"></el-option>
                   <el-option label="付" value="C"></el-option>
@@ -739,7 +745,9 @@
                 <el-select
                   v-model="scope.row.fFeeunitid"
                   placeholder="请选择计费单位"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   clearable
                 >
                   <el-option
@@ -761,7 +769,9 @@
                 <el-input
                   v-model="scope.row.fBillingQty"
                   placeholder="请输入内容"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   @input="total(scope.row)"
                   v-input-limit="2"
                 ></el-input>
@@ -777,7 +787,9 @@
                 <el-input
                   v-model="scope.row.fUnitprice"
                   placeholder="请输入内容"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   @input="total(scope.row)"
                   v-input-limit="2"
                 ></el-input>
@@ -792,7 +804,9 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.fCurrency"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   placeholder="请输入内容"
                 ></el-input>
               </template>
@@ -806,7 +820,9 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.fExrate"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   placeholder="请输入内容"
                 ></el-input>
               </template>
@@ -820,7 +836,9 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.fAmount"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   placeholder="请输入内容"
                 ></el-input>
               </template>
@@ -834,7 +852,9 @@
               <template slot-scope="scope">
                 <el-input
                   v-model="scope.row.fTaxrate"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                   placeholder="请输入内容"
                 ></el-input>
               </template>
@@ -849,7 +869,9 @@
                 <el-input
                   v-model="scope.row.remarks"
                   placeholder="请输入内容"
-                  :disabled="scope.row.fBillstatus > 2 || scope.row.fBillstatus <=6"
+                  :disabled="
+                    scope.row.fBillstatus > 2 && scope.row.fBillstatus <= 6
+                  "
                 ></el-input>
               </template>
             </el-table-column>
@@ -885,7 +907,7 @@
                   @click.native.prevent="fixFees(scope.row)"
                   >变更</el-button
                 >
-                 <el-button
+                <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-document-delete"
@@ -1058,26 +1080,54 @@
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="submitForm('acceptDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
+      <el-button
+        type="primary"
+        @click="submitForm('acceptDate')"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
         >接 单</el-button
       >
-      <el-button type="primary" @click="submitForm('loadDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
+      <el-button
+        type="primary"
+        @click="submitForm('loadDate')"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
         >提 箱</el-button
       >
-      <el-button type="primary" @click="submitForm('mdLoadDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
+      <el-button
+        type="primary"
+        @click="submitForm('mdLoadDate')"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
         >装卸货</el-button
       >
-      <el-button type="primary" @click="submitForm('unLoadDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
+      <el-button
+        type="primary"
+        @click="submitForm('unLoadDate')"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
         >还卸柜</el-button
       >
-      <el-button type="primary" @click="submitForm('waybillDate')" v-hasPermi="['fleet:vehicleStatus:edit']"
+      <el-button
+        type="primary"
+        @click="submitForm('waybillDate')"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
         >回 单</el-button
       >
-      <el-button type="primary" @click="driversubmitForm" v-hasPermi="['fleet:vehicleStatus:edit']"
+      <el-button
+        type="primary"
+        @click="driversubmitForm"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
         >提 交</el-button
       >
-      <el-button type="success" @click="submitAllowChanges" v-hasPermi="['fleet:vehicleStatus:edit']">修 改</el-button>
-      <el-button type="info" @click="submitSave" v-hasPermi="['fleet:vehicleStatus:edit']">保 存</el-button>
+      <el-button
+        type="success"
+        @click="submitAllowChanges"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
+        >修 改</el-button
+      >
+      <el-button
+        type="info"
+        @click="submitSave"
+        v-hasPermi="['fleet:vehicleStatus:edit']"
+        >保 存</el-button
+      >
       <!-- <el-button type="warning" @click="submitRetreat">撤 回</el-button> -->
       <el-button @click="showDialog = false">取 消</el-button>
     </span>
@@ -1095,7 +1145,13 @@ import { listGoods } from "@/api/basicdata/goods";
 import { listCorps } from "@/api/basicdata/corps";
 import { listFees } from "@/api/basicdata/fees";
 import UploadFile from "@/components/Uploadfile";
-import { submit, changeFees ,revokeFees,deleteFees,driverSubmit} from "@/api/track/singleCost";
+import {
+  submit,
+  changeFees,
+  revokeFees,
+  deleteFees,
+  driverSubmit,
+} from "@/api/track/singleCost";
 import Cookies from "js-cookie";
 import { getToken } from "@/utils/auth";
 export default {
@@ -1125,7 +1181,7 @@ export default {
     },
     feesList: {
       type: Array,
-      default:() => [],
+      default: () => [],
     },
     allfMblnoOptions: {
       type: Array,
@@ -1302,8 +1358,9 @@ export default {
         })
           .then(() => {
             this.chiFeesList = this.chiFeesList.filter(
-              (e) => e.actId != "1080"
+              (e) => e.fBillstatus == 6 || e.actId != "1080"
             );
+            console.log(this.chiFeesList);
             this.addRelevt3();
           })
           .catch(() => {
@@ -1318,244 +1375,358 @@ export default {
     },
     addRelevt3() {
       if (this.form.oilAmt > 0) {
-        this.chiFeesList.push({
-          actId: "1080",
-          fCorpid: this.form.driverUserId,
-          fFeeid: 52,
-          fDc: "C",
-          fFeeunitid: "6",
-          fBillingQty: 1,
-          fUnitprice: this.form.oilAmt,
-          fCurrency: "RMB",
-          fTaxrate: 3,
-          fAmount: this.form.oilAmt,
-          fExrate: 1,
-          remarks: null,
-        });
-      }
-      if (this.form.driverbonus > 0) {
-        this.chiFeesList.push({
-          actId: "1080",
-          fCorpid: this.form.driverUserId,
-          fFeeid: 53,
-          fDc: "C",
-          fFeeunitid: "6",
-          fBillingQty: 1,
-          fUnitprice: this.form.driverbonus,
-          fCurrency: "RMB",
-          fTaxrate: 3,
-          fAmount: this.form.driverbonus,
-          fExrate: 1,
-          remarks: null,
-        });
-      }
-      if (this.form.costOth > 0) {
-        this.chiFeesList.push({
-          actId: "1080",
-          fCorpid: this.form.driverUserId,
-          fFeeid: 54,
-          fDc: "C",
-          fFeeunitid: "6",
-          fBillingQty: 1,
-          fUnitprice: this.form.costOth,
-          fCurrency: "RMB",
-          fTaxrate: 3,
-          fAmount: this.form.costOth,
-          fExrate: 1,
-          remarks: null,
+        this.fFeeid52 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 52 && e.actId == 1080) {
+            this.fFeeid52 = false;
+          }
         });
-      }
-      if (this.form.costomAmt03 > 0) {
-        this.chiFeesList.push(
-          {
-            actId: "1080",
-            fCorpid: this.form.fCorpId,
-            fFeeid: 55,
-            fDc: "D",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt03,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt03,
-            fExrate: 1,
-            remarks: null,
-          },
-          {
+        if (this.fFeeid52) {
+          this.chiFeesList.push({
             actId: "1080",
             fCorpid: this.form.driverUserId,
-            fFeeid: 55,
+            fFeeid: 52,
             fDc: "C",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.costomAmt03,
+            fUnitprice: this.form.oilAmt,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.costomAmt03,
+            fAmount: this.form.oilAmt,
             fExrate: 1,
             remarks: null,
-          }
-        );
+          });
+        }
       }
-      if (this.form.costomAmt04 > 0) {
-        this.chiFeesList.push(
-          {
-            actId: "1080",
-            fCorpid: this.form.fCorpId,
-            fFeeid: 56,
-            fDc: "D",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt04,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt04,
-            fExrate: 1,
-            remarks: null,
-          },
-          {
+      if (this.form.driverbonus > 0) {
+        this.fFeeid53 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 53 && e.actId == 1080) {
+            this.fFeeid53 = false;
+          }
+        });
+        if (this.fFeeid53) {
+          this.chiFeesList.push({
             actId: "1080",
             fCorpid: this.form.driverUserId,
-            fFeeid: 56,
+            fFeeid: 53,
             fDc: "C",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.costomAmt04,
+            fUnitprice: this.form.driverbonus,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.costomAmt04,
+            fAmount: this.form.driverbonus,
             fExrate: 1,
             remarks: null,
-          }
-        );
+          });
+        }
       }
-      if (this.form.costomAmt02 > 0) {
-        this.chiFeesList.push(
-          {
-            actId: "1080",
-            fCorpid: this.form.fCorpId,
-            fFeeid: 57,
-            fDc: "D",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt02,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt02,
-            fExrate: 1,
-            remarks: null,
-          },
-          {
+      if (this.form.costOth > 0) {
+        this.fFeeid54 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 54 && e.actId == 1080) {
+            this.fFeeid54 = false;
+          }
+        });
+        if (this.fFeeid54) {
+          this.chiFeesList.push({
             actId: "1080",
             fCorpid: this.form.driverUserId,
-            fFeeid: 57,
+            fFeeid: 54,
             fDc: "C",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.costomAmt02,
+            fUnitprice: this.form.costOth,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.costomAmt02,
+            fAmount: this.form.costOth,
             fExrate: 1,
             remarks: null,
+          });
+        }
+      }
+      if (this.form.costomAmt03 > 0) {
+        this.fFeeid55 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 55 && e.actId == 1080) {
+            this.fFeeid55 = false;
           }
-        );
+        });
+        if (this.fFeeid55) {
+          this.chiFeesList.push(
+            {
+              actId: "1080",
+              fCorpid: this.form.fCorpId,
+              fFeeid: 55,
+              fDc: "D",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt03,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt03,
+              fExrate: 1,
+              remarks: null,
+            },
+            {
+              actId: "1080",
+              fCorpid: this.form.driverUserId,
+              fFeeid: 55,
+              fDc: "C",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt03,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt03,
+              fExrate: 1,
+              remarks: null,
+            }
+          );
+        }
+      }
+      if (this.form.costomAmt04 > 0) {
+        this.fFeeid56 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 56 && e.actId == 1080) {
+            this.fFeeid56 = false;
+          }
+        });
+        if (this.fFeeid56) {
+          this.chiFeesList.push(
+            {
+              actId: "1080",
+              fCorpid: this.form.fCorpId,
+              fFeeid: 56,
+              fDc: "D",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt04,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt04,
+              fExrate: 1,
+              remarks: null,
+            },
+            {
+              actId: "1080",
+              fCorpid: this.form.driverUserId,
+              fFeeid: 56,
+              fDc: "C",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt04,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt04,
+              fExrate: 1,
+              remarks: null,
+            }
+          );
+        }
+      }
+      if (this.form.costomAmt02 > 0) {
+        this.chiFeesList.map((e) => {
+          this.fFeeid57 = true;
+          if (e.fFeeid == 57 && e.actId == 1080) {
+            this.fFeeid57 = false;
+          }
+        });
+        if (this.fFeeid57) {
+          this.chiFeesList.push(
+            {
+              actId: "1080",
+              fCorpid: this.form.fCorpId,
+              fFeeid: 57,
+              fDc: "D",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt02,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt02,
+              fExrate: 1,
+              remarks: null,
+            },
+            {
+              actId: "1080",
+              fCorpid: this.form.driverUserId,
+              fFeeid: 57,
+              fDc: "C",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt02,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt02,
+              fExrate: 1,
+              remarks: null,
+            }
+          );
+        }
       }
       if (this.form.costomAmt05 > 0) {
-        this.chiFeesList.push(
-          {
-            actId: "1080",
-            fCorpid: this.form.fCorpId,
-            fFeeid: 58,
-            fDc: "D",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt05,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt05,
-            fExrate: 1,
-            remarks: null,
-          },
-          {
-            actId: "1080",
-            fCorpid: this.form.driverUserId,
-            fFeeid: 58,
-            fDc: "C",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt05,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt05,
-            fExrate: 1,
-            remarks: null,
+        this.fFeeid58 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 58 && e.actId == 1080) {
+            this.fFeeid58 = false;
           }
-        );
+        });
+        if (this.fFeeid58) {
+          this.chiFeesList.push(
+            {
+              actId: "1080",
+              fCorpid: this.form.fCorpId,
+              fFeeid: 58,
+              fDc: "D",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt05,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt05,
+              fExrate: 1,
+              remarks: null,
+            },
+            {
+              actId: "1080",
+              fCorpid: this.form.driverUserId,
+              fFeeid: 58,
+              fDc: "C",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt05,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt05,
+              fExrate: 1,
+              remarks: null,
+            }
+          );
+        }
       }
       if (this.form.costomAmt06 > 0) {
-        this.chiFeesList.push(
-          {
-            actId: "1080",
-            fCorpid: this.form.fCorpId,
-            fFeeid: 59,
-            fDc: "D",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt06,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt06,
-            fExrate: 1,
-            remarks: null,
-          },
-          {
-            actId: "1080",
-            fCorpid: this.form.driverUserId,
-            fFeeid: 59,
-            fDc: "C",
-            fFeeunitid: "6",
-            fBillingQty: 1,
-            fUnitprice: this.form.costomAmt06,
-            fCurrency: "RMB",
-            fTaxrate: 3,
-            fAmount: this.form.costomAmt06,
-            fExrate: 1,
-            remarks: null,
+        this.fFeeid59 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 59 && e.actId == 1080) {
+            this.fFeeid59 = false;
           }
-        );
+        });
+        if (this.fFeeid59) {
+          this.chiFeesList.push(
+            {
+              actId: "1080",
+              fCorpid: this.form.fCorpId,
+              fFeeid: 59,
+              fDc: "D",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt06,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt06,
+              fExrate: 1,
+              remarks: null,
+            },
+            {
+              actId: "1080",
+              fCorpid: this.form.driverUserId,
+              fFeeid: 59,
+              fDc: "C",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt06,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt06,
+              fExrate: 1,
+              remarks: null,
+            }
+          );
+        }
       }
       if (this.form.costomAmt01 > 0) {
-        this.chiFeesList.push(
-          {
+        this.fFeeid60 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 60 && e.actId == 1080) {
+            this.fFeeid60 = false;
+          }
+        });
+        if (this.fFeeid60) {
+          this.chiFeesList.push(
+            {
+              actId: "1080",
+              fCorpid: this.form.fCorpId,
+              fFeeid: 60,
+              fDc: "D",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt01,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt01,
+              fExrate: 1,
+              remarks: null,
+            },
+            {
+              actId: "1080",
+              fCorpid: this.form.driverUserId,
+              fFeeid: 60,
+              fDc: "C",
+              fFeeunitid: "6",
+              fBillingQty: 1,
+              fUnitprice: this.form.costomAmt01,
+              fCurrency: "RMB",
+              fTaxrate: 3,
+              fAmount: this.form.costomAmt01,
+              fExrate: 1,
+              remarks: null,
+            }
+          );
+        }
+      }
+      if (this.form.priceDr > 0 || this.form.priceCr > 0) {
+        this.fFeeid61 = true;
+        this.chiFeesList.map((e) => {
+          if (e.fFeeid == 61 && e.actId == 1080) {
+            this.fFeeid61 = false;
+          }
+        });
+        if (this.fFeeid61 && this.form.priceDr > 0) {
+          this.chiFeesList.push({
             actId: "1080",
             fCorpid: this.form.fCorpId,
-            fFeeid: 60,
+            fFeeid: 61,
             fDc: "D",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.costomAmt01,
+            fUnitprice: this.form.priceDr,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.costomAmt01,
+            fAmount: this.form.priceDr,
             fExrate: 1,
             remarks: null,
-          },
-          {
+          });
+        }
+        if (this.fFeeid61 && this.form.priceCr > 0) {
+          this.chiFeesList.push({
             actId: "1080",
-            fCorpid: this.form.driverUserId,
-            fFeeid: 60,
+            fCorpid: this.form.carcorPid,
+            fFeeid: 61,
             fDc: "C",
             fFeeunitid: "6",
             fBillingQty: 1,
-            fUnitprice: this.form.costomAmt01,
+            fUnitprice: this.form.priceCr,
             fCurrency: "RMB",
             fTaxrate: 3,
-            fAmount: this.form.costomAmt01,
+            fAmount: this.form.priceCr,
             fExrate: 1,
             remarks: null,
-          }
-        );
+          });
+        }
+      } else {
+        this.$message.error("未找到运输费用，请确认是否已添加");
       }
     },
     // 弹出框关闭后触发
@@ -1630,18 +1801,18 @@ export default {
         this.msgSuccess("不允许修改");
       }
     },
-    driversubmitForm(){
-      if(this.chiFeesList.length==0){
+    driversubmitForm() {
+      if (this.chiFeesList.length == 0) {
         return this.$message.error("确认费用不能为空");
       }
-       let formData = new window.FormData();
+      let formData = new window.FormData();
       formData.append("cars", JSON.stringify(this.form));
       formData.append("attachs", JSON.stringify(this.relevantAttachments));
       formData.append("fees", JSON.stringify(this.chiFeesList));
       driverSubmit(formData).then((response) => {
         if (response.code == 200) {
           this.msgSuccess("提交成功");
-          this.showDialog=false;
+          this.showDialog = false;
           this.$parent.getList();
         }
       });
@@ -1690,19 +1861,19 @@ export default {
             this.$message.success("删除成功");
           }
         });
-      } else if (!row.fBillstatus){
+      } else if (!row.fBillstatus) {
         rows.splice(index, 1);
         this.$message.success("删除成功");
-      }else{
-         this.$message.error("不允许删除");
+      } else {
+        this.$message.error("不允许删除");
       }
     },
-    revokeFees(row){
+    revokeFees(row) {
       revokeFees(row.fId).then((response) => {
-          if (response.code == 200) {
-            this.$message.success("撤销成功");
-            this.$set(row, "fBillstatus", 3);
-          }
+        if (response.code == 200) {
+          this.$message.success("撤销成功");
+          this.$set(row, "fBillstatus", 3);
+        }
       });
     },
     //单条订单调度提交

src/views/track/cabinet/index.vue

@@ -1021,6 +1021,11 @@ export default {
         if (response.data.cars.billType) {
           response.data.cars.billType = response.data.cars.billType.toString();
         }
+        response.data.feesList.map(e=>{
+          if(e.fFeeunitid){
+              e.fFeeunitid=e.fFeeunitid.toString();
+          }
+        })
         this.title = "查看详情页";
         this.form = response.data.cars;
         this.relevantAttachments = response.data.attachs;

src/views/warehouseBusiness/cargoClearance/index.vue

@@ -356,7 +356,7 @@
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column
         label="提单号"
-        width="180"
+        width="220"
         align="center"
         :show-overflow-tooltip="true"
         sortable

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -728,12 +728,19 @@
                   align="center"
                 >
                   <template slot-scope="scope">
-                    <el-input
-                      placeholder="请输入箱型"
+                    <el-select
+                      placeholder="请选择箱型"
                       v-model="scope.row.fCntrid"
                       size="mini"
                     >
-                    </el-input>
+                        <el-option
+                        v-for="(item,index) in fCntridlist"
+                        :key="index.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -2114,6 +2121,7 @@ export default {
   },
   data() {
     return {
+      fCntridlist:[],
       CntrTable: [{}],
       idCopy: "",
       //全屏放大

src/views/warehouseBusiness/inStock/index.vue

@@ -352,6 +352,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
@@ -378,7 +379,7 @@
       <!--        />-->
       <el-table-column
         label="提单号"
-        width="180"
+        width="220"
         align="center"
         :show-overflow-tooltip="true"
         sortable
@@ -926,6 +927,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :offset="16" :span="2">
+                <el-form-item>
+                  <el-button
+                    @click="
+                      detailsHidden
+                        ? (detailsHidden = false)
+                        : (detailsHidden = true)
+                    "
+                    >{{ detailsHidden ? "隐藏" : "展开" }}
+                  </el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-col>
           <el-col :span="8">
             <el-form-item>
@@ -942,12 +957,19 @@
                   align="center"
                 >
                   <template slot-scope="scope">
-                    <el-input
-                      placeholder="请输入箱型"
+                    <el-select
+                      placeholder="请选择箱型"
                       v-model="scope.row.fCntrid"
                       size="mini"
                     >
-                    </el-input>
+                      <el-option
+                        v-for="(item,index) in fCntridlist"
+                        :key="index.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -990,20 +1012,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="2">
-            <el-form-item>
-              <el-button
-                @click="
-                  detailsHidden
-                    ? (detailsHidden = false)
-                    : (detailsHidden = true)
-                "
-                >{{ detailsHidden ? "隐藏" : "展开" }}
-              </el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <div v-if="detailsHidden">
           <el-row style="margin-top: 30px">
             <el-col :span="8">
@@ -3796,7 +3804,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getToken } from "@/utils/auth";
 import Cookies from "js-cookie";
-import { addSet, select } from "@/api/system/set";
+import { addSet, select, resetModule } from "@/api/system/set";
 import draggable from "vuedraggable";
 import Vue from "vue";
 import { delCharge } from "@/api/finance/payment";
@@ -3868,6 +3876,7 @@ export default {
   },
   data() {
     return {
+      fCntridlist: [],
       mblnoStatus: "",
       allfGrossweight: 0,
       allfNetweight: 0,
@@ -3878,7 +3887,7 @@ export default {
       drag: false,
       stockName: "",
       makeDate: "",
-      setRowList: [
+      tableDate: [
         {
           surface: "1",
           label: "createBy",
@@ -4016,144 +4025,8 @@ export default {
           width: 100,
         },
       ],
-      getRowList: [
-        {
-          surface: "1",
-          label: "createBy",
-          name: "制单人",
-          checked: 0,
-          fixed: "left",
-          width: 100,
-        },
-        {
-          surface: "2",
-          label: "fItemsStatus",
-          name: "入库状态",
-          checked: 0,
-          fixed: "left",
-          width: 100,
-        },
-        {
-          surface: "3",
-          label: "fCorpid",
-          name: "货权方",
-          checked: 0,
-          fixed: "left",
-          width: 100,
-        },
-        {
-          surface: "5",
-          label: "fProductName",
-          name: "品名",
-          checked: 0,
-          fixed: "left",
-          width: 100,
-        },
-        {
-          surface: "6",
-          label: "fMarks",
-          name: "品牌",
-          checked: 0,
-          fixed: "left",
-          width: 100,
-        },
-        {
-          surface: "7",
-          label: "fBsdate",
-          name: "入库日期",
-          checked: 0,
-          fixed: "left",
-          width: 100,
-        },
-        {
-          surface: "8",
-          label: "fWarehouseid",
-          name: "仓库",
-
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "9",
-          label: "fPlanqty",
-          name: "计划件数",
-
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "10",
-          label: "fQty",
-          name: "入库件数",
-
-          checked: 0,
-          width: 100,
-        },
-        {
-          surface: "11",
-          label: "fGrossweight",
-          name: "入库毛重(KG)",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "12",
-          label: "fNetweight",
-          name: "入库净重(KG)",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "13",
-          label: "fTruckno",
-          name: "车号",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "14",
-          label: "fDriverName",
-          name: "司机名称",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "15",
-          label: "fDriverTel",
-          name: "司机电话",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "16",
-          label: "fDriverIdCar",
-          name: "司机身份证",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "17",
-          label: "fBusinessType",
-          name: "业务类别",
-          checked: 0,
-
-          width: 100,
-        },
-        {
-          surface: "18",
-          label: "fBillstatus",
-          name: "费用状态",
-          checked: 0,
-
-          width: 100,
-        },
-      ],
+      setRowList: [],
+      getRowList: [],
       allCheck: false,
       showSetting: false,
       //附件明细上传属性
@@ -4435,6 +4308,8 @@ export default {
     };
   },
   created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     this.getList();
     this.getDicts("storage_type").then((response) => {
       if (response.data) {
@@ -4573,7 +4448,20 @@ export default {
           }, []);
         }
       });
-      console.log(this.getRowList);
+    },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "入库",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
     },
     //保存列设置
     save() {
@@ -4584,7 +4472,10 @@ export default {
         sysTableSetList: this.setRowList,
       };
       addSet(this.data).then((res) => {
-        this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        }
       });
     },
     //开始拖拽事件
@@ -6202,10 +6093,10 @@ export default {
           }
           if (response.data.warehouseBillsItem) {
             this.dataList = response.data.warehouseBillsItem;
-               if (!this.dataList.length) {
-          this.form.fProductName = "";
-          this.form.fMarks = "";
-      }
+            if (!this.dataList.length) {
+              this.form.fProductName = "";
+              this.form.fMarks = "";
+            }
             for (let list in this.dataList) {
               if (this.dataList[list].fBillstatus > 10) {
                 this.formBrowseStatus = true;

src/views/warehouseBusiness/outStock/index.vue

@@ -339,6 +339,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showSetting = false">取 消</el-button>
+        <el-button @click="delRow" type="danger">重 置</el-button>
         <el-button type="primary" @click="save()">确 定</el-button>
       </span>
     </el-dialog>
@@ -354,7 +355,7 @@
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column
         label="提单号"
-        width="180"
+        width="220"
         align="center"
         :show-overflow-tooltip="true"
         sortable
@@ -897,6 +898,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
+             <el-row>
+          <el-col :offset="16" :span="2">
+            <el-form-item>
+              <el-button
+                @click="
+                  detailsHidden
+                    ? (detailsHidden = false)
+                    : (detailsHidden = true)
+                "
+                >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
+              >
+            </el-form-item>
+          </el-col>
+        </el-row>
           </el-col>
           <el-col :span="8">
             <el-form-item>
@@ -913,12 +928,19 @@
                   align="center"
                 >
                   <template slot-scope="scope">
-                    <el-input
-                      placeholder="请输入箱型"
+                    <el-select
+                      placeholder="请选择箱型"
                       v-model="scope.row.fCntrid"
                       size="mini"
                     >
-                    </el-input>
+                       <el-option
+                        v-for="(item,index) in fCntridlist"
+                        :key="index.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -961,21 +983,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item>
-              <el-button
-                @click="
-                  detailsHidden
-                    ? (detailsHidden = false)
-                    : (detailsHidden = true)
-                "
-                >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <div v-if="detailsHidden">
           <el-row style="margin-top: 30px">
             <el-col :span="8">
@@ -3658,7 +3665,7 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getToken } from "@/utils/auth";
 import Cookies from "js-cookie";
-import { addSet, select } from "@/api/system/set";
+import { addSet, select, resetModule  } from "@/api/system/set";
 import draggable from "vuedraggable";
 import Vue from "vue";
 Vue.directive("dialogDrag", {
@@ -3727,6 +3734,7 @@ export default {
   },
   data() {
     return {
+      fCntridlist:[],
       idCopy: "",
       //全屏放大
       dialogFull: false,
@@ -3740,7 +3748,7 @@ export default {
       print_dpxx: false,
       stockName: "",
       makeDate: "",
-      setRowList: [
+      tableDate:[
         {
           surface: "1",
           label: "createBy",
@@ -3868,7 +3876,7 @@ export default {
           width: 100,
         },
       ],
-      getRowList: [
+      setRowList: [
         {
           surface: "1",
           label: "createBy",
@@ -3996,6 +4004,7 @@ export default {
           width: 100,
         },
       ],
+      getRowList: [],
       allCheck: false,
       showSetting: false,
       headers: {
@@ -4275,6 +4284,8 @@ export default {
     };
   },
   created() {
+    this.setRowList = this.tableDate;
+    this.getRowList = this.tableDate;
     this.getList();
     this.getDicts("storage_type").then((response) => {
       this.fStorageTypeOptions = response.data;
@@ -4371,7 +4382,7 @@ export default {
     full() {
       this.dialogFull = !this.dialogFull;
     },
-    //列设置全选
+     //列设置全选
     allChecked() {
       if (this.allCheck == true) {
         this.setRowList.map((e) => {
@@ -4408,6 +4419,20 @@ export default {
         }
       });
     },
+    //重置列表
+    delRow() {
+      this.data = {
+        tableName: "出库",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.setRowList = this.tableDate;
+          this.getRowList = this.tableDate;
+        }
+      });
+    },
     //保存列设置
     save() {
       this.showSetting = false;
@@ -4417,7 +4442,10 @@ export default {
         sysTableSetList: this.setRowList,
       };
       addSet(this.data).then((res) => {
-        this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        if (res.code == 200) {
+          this.showSetting = false;
+          this.getRowList = this.setRowList.filter((e) => e.checked == 0);
+        }
       });
     },
     //开始拖拽事件

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -355,7 +355,7 @@
       <el-table-column type="index" label="行号" fixed align="center" />
       <el-table-column
         label="提单号"
-        width="180"
+        width="220"
         align="center"
         :show-overflow-tooltip="true"
         sortable
@@ -846,52 +846,66 @@
           </el-col>
         </el-row>
         <el-row>
-            <el-col :span="16">
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item
-                    label="车队"
-                    prop="fFleet"
-                    :rules="{
-                      required: isrequired === 1 ? true : false,
-                      message: '请选择',
-                      trigger: ['blur', 'change'],
-                    }"
+          <el-col :span="16">
+            <el-row>
+              <el-col :span="12">
+                <el-form-item
+                  label="车队"
+                  prop="fFleet"
+                  :rules="{
+                    required: isrequired === 1 ? true : false,
+                    message: '请选择',
+                    trigger: ['blur', 'change'],
+                  }"
+                >
+                  <el-select
+                    style="width: 80%"
+                    v-model="form.fFleet"
+                    filterable
+                    remote
+                    :remote-method="fleetRemoteMethod"
+                    :disabled="contrOl"
+                    placeholder="请输入车队"
                   >
-                    <el-select
-                      style="width: 80%"
-                      v-model="form.fFleet"
-                      filterable
-                      remote
-                      :remote-method="fleetRemoteMethod"
-                      :disabled="contrOl"
-                      placeholder="请输入车队"
-                    >
-                      <el-option
-                        v-for="(dict, index) in fleetOptions"
-                        :key="index.fId"
-                        :label="dict.fName"
-                        :value="dict.fId"
-                      ></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="备注" prop="remark">
-                    <el-input
+                    <el-option
+                      v-for="(dict, index) in fleetOptions"
+                      :key="index.fId"
+                      :label="dict.fName"
+                      :value="dict.fId"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="备注" prop="remark">
+                  <el-input
                     style="width: 92%"
-                      v-model="form.remark"
-                      :disabled="browseStatus"
-                      type="textarea"
-                      placeholder="请输入内容"
-                    />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-col>
-             <el-col :span="8">
+                    v-model="form.remark"
+                    :disabled="browseStatus"
+                    type="textarea"
+                    placeholder="请输入内容"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :offset="16" :span="2">
+                <el-form-item>
+                  <el-button
+                    @click="
+                      detailsHidden
+                        ? (detailsHidden = false)
+                        : (detailsHidden = true)
+                    "
+                    >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
+                  >
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="8">
             <el-form-item>
               <el-table
                 :data="CntrTable"
@@ -906,12 +920,19 @@
                   align="center"
                 >
                   <template slot-scope="scope">
-                    <el-input
-                      placeholder="请输入箱型"
+                    <el-select
+                      placeholder="请选择箱型"
                       v-model="scope.row.fCntrid"
                       size="mini"
                     >
-                    </el-input>
+                      <el-option
+                        v-for="(item,index) in fCntridlist"
+                        :key="index.value"
+                        :label="item.label"
+                        :value="item.value"
+                      >
+                      </el-option>
+                    </el-select>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -942,8 +963,7 @@
                       type="text"
                       @click.native.prevent="deleteRow(scope.$index, CntrTable)"
                       icon="el-icon-delete"
-                      ></el-button
-                    >
+                    ></el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -955,21 +975,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item>
-              <el-button
-                @click="
-                  detailsHidden
-                    ? (detailsHidden = false)
-                    : (detailsHidden = true)
-                "
-                >{{ detailsHidden ? "隐藏" : "展开" }}</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-
         <div v-if="detailsHidden">
           <el-row style="margin-top: 30px">
             <el-col :span="8">
@@ -3331,6 +3336,7 @@ export default {
   },
   data() {
     return {
+      fCntridlist:[],
       stockName: "",
       idCopy: "",
       //全屏放大
@@ -4014,7 +4020,7 @@ export default {
                 return prev;
               }
             }, 0);
-            if (index === 14|| index === 15) {
+            if (index === 14 || index === 15) {
               sums[index] = (sums[index] / 1000).toFixed(2) + "(吨)";
             }
             if (index === 13) {
@@ -5370,8 +5376,8 @@ export default {
         this.fDNameOptions = response.rows;
       });
       if (!this.dataList.length) {
-          this.form.fProductName = "";
-          this.form.fMarks = "";
+        this.form.fProductName = "";
+        this.form.fMarks = "";
       }
       if (status === 2) {
         this.goodsRemoteMethod();
@@ -5380,7 +5386,7 @@ export default {
             this.form = response.data.warehousebills;
             this.form.fProductName = "";
             this.form.fMarks = "";
-            this.form.fMblno=""
+            this.form.fMblno = "";
             queryUserVal().then((response) => {
               this.Lander = response.user.userName;
               this.form.fStorekeeper = response.user.nickName;