修改车队

src/App.vue

@@ -40,9 +40,12 @@ export default {
        z-index: 2
 }
 .el-form-item {
-    margin-bottom: 10px !important;
+    margin-bottom: 4px !important;
 }
 .el-dialog__body {
   padding: 10px 30px 30px 30px !important;
 }
+.el-divider--horizontal {
+    margin: 0 0 3px 0;
+}
 </style>

src/views/fleet/fleetStatistics/index.vue

@@ -14,6 +14,7 @@
               placeholder="请选择结算单位"
               clearable
               size="small"
+              style="width: 100%"
               filterable
               @keyup.enter.native="handleQuery"
             >
@@ -33,6 +34,7 @@
               placeholder="请选择对账状态"
               clearable
               size="small"
+              style="width: 100%"
               filterable
               @keyup.enter.native="handleQuery"
             >
@@ -52,6 +54,7 @@
               placeholder="请选择对账状态"
               clearable
               size="small"
+              style="width: 100%"
               filterable
             >
               <el-option
@@ -70,6 +73,7 @@
               placeholder="请选择开票状态"
               clearable
               size="small"
+              style="width: 100%"
             >
               <el-option
                 v-for="(dict, index) in invOptions"
@@ -81,15 +85,52 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label-width="100px" label="主运单号" prop="mBillNo">
+            <el-input
+              v-model="queryParams.mBillNo"
+              placeholder="请输入主运单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="100px" label="运单号" prop="orderNo">
+            <el-input
+              v-model="queryParams.orderNo"
+              placeholder="请输入运单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label-width="100px" label="车牌号" prop="carregNo">
+            <el-input
+              v-model="queryParams.carregNo"
+              placeholder="请输入车牌号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="width: 100%"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label-width="100px" label="接单时间">
             <el-date-picker
-              style="width: 80%"
+              style="width: 100%"
               v-model="queryParams.acceptDateList"
               type="daterange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
-              :default-time="['00:00:00', '23:59:59']"
+              :default-time="['00:00:00', '23:59:59']"
+              size="small"
               >      
             </el-date-picker>
           </el-form-item>
@@ -97,13 +138,14 @@
         <el-col :span="6">
           <el-form-item label="对账时间">
             <el-date-picker
-              style="width: 80%"
+              style="width: 100%"
               v-model="queryParams.accchkDateList"
               type="daterange"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               value-format="yyyy-MM-dd HH:mm:ss"
-              :default-time="['00:00:00', '23:59:59']"
+              :default-time="['00:00:00', '23:59:59']"
+              size="small"
             >
             </el-date-picker>
           </el-form-item>
@@ -147,6 +189,14 @@
               size="mini"
               circle
               @click="showSetting = !showSetting"
+              v-if="typevalue != 2"
+            ></el-button>
+            <el-button
+              icon="el-icon-setting"
+              size="mini"
+              circle
+              @click="showSetting2 = !showSetting2"
+              v-else
             ></el-button>
           </el-tooltip>
         </div>
@@ -204,7 +254,12 @@
         <el-button type="primary" @click="save">确 定</el-button>
       </span>
     </el-dialog>
-    <el-table v-loading="loading" :data="tabularData" id="out-table">
+    <el-table
+      v-if="typevalue != 2"
+      v-loading="loading"
+      :data="tabularData"
+      id="out-table"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="提单号"
@@ -234,6 +289,77 @@
         :fixed="item.fixed"
       />
     </el-table>
+    <el-dialog title="自定义列显示" :visible.sync="showSetting" width="700px">
+      <div>配置排序列数据（拖动调整顺序）</div>
+      <div style="margin-left: 17px">
+        <el-checkbox
+          v-model="allCheck2"
+          label="全选"
+          @change="allChecked2"
+        ></el-checkbox>
+      </div>
+      <div style="padding: 4px; display: flex; justify-content: center">
+        <draggable
+          v-model="setRowList2"
+          group="site"
+          animation="300"
+          @start="onStart"
+          @end="onEnd"
+          handle=".indraggable"
+        >
+          <transition-group>
+            <div
+              v-for="item in setRowList2"
+              :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="showSetting2 = false">取 消</el-button>
+        <el-button @click="delRow2" type="danger">重 置</el-button>
+        <el-button type="primary" @click="save2">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-table
+      v-if="typevalue == 2"
+      v-loading="loading"
+      :data="tabularData"
+      id="out-table"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        v-for="(item, index) in getRowList2"
+        :key="index"
+        :label="item.name"
+        :width="item.width"
+        :prop="item.label"
+        align="center"
+        :show-overflow-tooltip="true"
+        sortable
+        :fixed="item.fixed"
+      />
+    </el-table>
     <pagination
       v-show="total > 0"
       :total="total"
@@ -245,11 +371,11 @@
 </template>
 
 <script>
-  import Cookies from "js-cookie";
-  import draggable from "vuedraggable";
-  import { listCorps } from "@/api/basicdata/corps";
-  import AddOrUpdate from "../scheduling/AddOrUpdate";
-  import { addSet, select, resetModule } from "@/api/system/set";
+import Cookies from "js-cookie";
+import draggable from "vuedraggable";
+import { listCorps } from "@/api/basicdata/corps";
+import AddOrUpdate from "../scheduling/AddOrUpdate";
+import { addSet, select, resetModule } from "@/api/system/set";
 import { queryLedgerList, ledgerListExport } from "@/api/fleet/fleetStatistics";
 
 export default {
@@ -303,7 +429,8 @@ export default {
         accchkDateList: null,
         acceptDateList: null,
       },
-      tableDate: [{
+      tableDate: [
+        {
           surface: "1",
           label: "acceptDate",
           name: "接单日期",
@@ -603,6 +730,141 @@ export default {
       tabularData: [],
       corpsOptions: [],
       showSetting: false,
+      tableDate2: [
+        {
+          surface: "1",
+          label: "carregNo",
+          name: "车牌号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "2",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+
+        {
+          surface: "3",
+          label: "acceptDate",
+          name: "接单日期",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "4",
+          label: "billType",
+          name: "运输性质",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "5",
+          label: "inMblno",
+          name: "进口提单号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "6",
+          label: "loadAddr",
+          name: "提箱地点",
+          checked: 0,
+          width: 100,
+        },
+
+        {
+          surface: "7",
+          label: "mdLoadAddr",
+          name: "卸货地点",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "8",
+          label: "cntrQty",
+          name: "箱量",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "cntrId",
+          name: "箱型",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "10",
+          label: "boxVolume",
+          name: "船名航次",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "11",
+          label: "outMblno",
+          name: "出口提单号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "12",
+          label: "driverName",
+          name: "司机",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "13",
+          label: "fleetId",
+          name: "费用名称",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "14",
+          label: "shippingDr",
+          name: "应收运费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "15",
+          label: "otherDr",
+          name: "应收其他",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "16",
+          label: "shippingCr",
+          name: "应付运费",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "17",
+          label: "otherCr",
+          name: "应付其他",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "18",
+          label: "profit",
+          name: "利润",
+          checked: 0,
+          width: 100,
+        },
+      ],
+      setRowList2: [],
+      getRowList2: [],
+      allCheck2: false,
+      showSetting2: false,
+      typevalue: null,
     };
   },
   // 使用子组件
@@ -613,8 +875,12 @@ export default {
   created() {
     this.setRowList = this.tableDate;
     this.getRowList = this.tableDate;
+    this.setRowList2 = this.tableDate2;
+    this.getRowList2 = this.tableDate2;
     // this.getList();
+    this.typevalue = Cookies.get("sysType");
     this.getRow();
+    this.getRow2();
     listCorps().then((response) => {
       this.corpsOptions = response.rows;
     });
@@ -660,7 +926,7 @@ export default {
     //重置列表
     delRow() {
       this.data = {
-        tableName: "计划下达",
+        tableName: "陆运台账",
         userId: Cookies.get("userName"),
       };
       resetModule(this.data).then((res) => {
@@ -675,7 +941,7 @@ export default {
     save() {
       this.showSetting = false;
       this.data = {
-        tableName: "计划下达",
+        tableName: "陆运台账",
         userId: Cookies.get("userName"),
         sysTableSetList: this.setRowList,
       };
@@ -686,6 +952,71 @@ export default {
         }
       });
     },
+    //列设置全选
+    allChecked2() {
+      if (this.allCheck2 == true) {
+        this.setRowList2.map((e) => {
+          return (e.checked = 0);
+        });
+      } else {
+        this.setRowList2.map((e) => {
+          return (e.checked = 1);
+        });
+      }
+    },
+    //查询列数据
+    getRow2() {
+      let that = this;
+      this.data = {
+        tableName: "车队-陆运台账",
+        userId: Cookies.get("userName"),
+      };
+      select(this.data).then((res) => {
+        if (res.data.length != 0) {
+          this.getRowList2 = res.data.filter((e) => e.checked == 0);
+          this.setRowList2 = res.data;
+          this.setRowList2 = this.setRowList2.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;
+          }, []);
+        }
+      });
+    },
+    //重置列表
+    delRow2() {
+      this.data = {
+        tableName: "车队-陆运台账",
+        userId: Cookies.get("userName"),
+      };
+      resetModule(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting2 = false;
+          this.setRowList2 = this.getRowList2 = this.$options.data().tableDate2;
+        }
+      });
+    },
+    //保存列设置
+    save2() {
+      this.showSetting = false;
+      this.data = {
+        tableName: "车队-陆运台账",
+        userId: Cookies.get("userName"),
+        sysTableSetList: this.setRowList2,
+      };
+      addSet(this.data).then((res) => {
+        if (res.code == 200) {
+          this.showSetting2 = false;
+          this.getRowList2 = this.setRowList2.filter((e) => e.checked == 0);
+        }
+      });
+    },
     //开始拖拽事件
     onStart() {
       this.drag = true;
@@ -698,7 +1029,7 @@ export default {
     getList() {
       if (!this.queryParams.acceptDateList) {
         this.$message.error("请选择接单时间");
-        return false
+        return false;
       }
       this.loading = true;
       queryLedgerList(this.queryParams).then((response) => {

src/views/fleet/plans/index.vue

@@ -176,13 +176,22 @@
           v-hasPermi="['fleet:ftmsorderbills:add']"
           >新增</el-button
         >
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="copyAdd"
+          v-hasPermi="['fleet:ftmsorderbills:add']"
+          :disabled="single"
+          >复制新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-edit"
           size="mini"
-          :disabled="true"
+          :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['fleet:ftmsorderbills:edit']"
           >修改</el-button
@@ -790,6 +799,20 @@ export default {
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
+    copyAdd() {
+      this.reset();
+      getFtmsorderbills(this.ids).then((response) => {
+        if (response.data.tmsorder.billType) {
+          response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
+        }
+        this.title = "添加订单主";
+        this.form = response.data.tmsorder;
+        this.form.id=null;
+        this.form.billStatus=null;
+        this.form.billNo=null;
+        this.addOrUpdateVisible = !this.addOrUpdateVisible;
+      });
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
@@ -798,6 +821,7 @@ export default {
         if (response.data.tmsorder.billType) {
           response.data.tmsorder.billType = response.data.tmsorder.billType.toString();
         }
+        this.title = "查看订单";
         // if (response.data.tmsorder.polId) {
         //   response.data.tmsorder.polId = response.data.tmsorder.polId.toString();
         // }

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -812,521 +812,6 @@
               </el-table>
             </div>
           </el-collapse-item>
-          <el-collapse-item name="3">
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
-                ><span
-                  style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-                  >收款信息</span
-                >
-              </i>
-            </template>
-            <div>
-              <div
-                style="
-                  display: flex;
-                  justify-content: space-between;
-                  margin: 10px 0;
-                "
-              >
-                <div>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="addDListRow(DList)"
-                    :disabled="disabled2"
-                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                    >添加</el-button
-                  >
-                </div>
-              </div>
-              <el-table :data="DList">
-                <el-table-column label="结算单位" align="center" prop="fCorpid">
-                  <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.fCorpid"
-                      placeholder="结算单位"
-                      :clearable="true"
-                      filterable
-                      :disabled="disabled2"
-                    >
-                      <el-option
-                        v-for="(dict, index) in fMblnoOptions"
-                        :key="index.fId"
-                        :label="dict.fName"
-                        :value="dict.fId"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="费用名称" align="center" prop="fFeeid">
-                  <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.fFeeid"
-                      placeholder="费用名称"
-                      clearable
-                      filterable
-                      :disabled="disabled2"
-                    >
-                      <el-option
-                        v-for="(dict, index) in fWbuOptions"
-                        :key="index.fId"
-                        :label="dict.fName"
-                        :value="dict.fId"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="计费单位"
-                  align="center"
-                  prop="fFeeunitid"
-                >
-                  <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.fFeeunitid"
-                      placeholder="计费单位"
-                      :disabled="disabled2"
-                    >
-                      <el-option
-                        v-for="(dict, index) in ffeeunitidList"
-                        :key="index.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fQty">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fQty"
-                      placeholder="计费数量"
-                      v-input-limit="0"
-                      :disabled="disabled2"
-                      @input="total(scope.row)"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="单价" align="center" prop="fUnitprice">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fUnitprice"
-                      placeholder="单价"
-                      v-input-limit="2"
-                      :disabled="disabled2"
-                      @input="total(scope.row)"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="币种" align="center" prop="fCurrency">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fCurrency"
-                      placeholder="RMB"
-                      :disabled="true"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fExrate">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fExrate"
-                      placeholder="汇率"
-                      v-input-limit="2"
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="金额" align="center" prop="fAmount">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fAmount"
-                      placeholder="金额"
-                      v-input-limit="2"
-                      :disabled="true"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="税率" align="center" prop="fTaxrate">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fTaxrate"
-                      placeholder="税率"
-                      v-input-limit="2"
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="备注" align="center" prop="remarks">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.remarks"
-                      placeholder="备注"
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  label="操作"
-                  align="center"
-                  class-name="small-padding fixed-width"
-                  width="100"
-                >
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      @click.native.prevent="deleteRow(scope.$index, DList)"
-                      :disabled="disabled2"
-                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                      >删除</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-collapse-item>
-          <el-collapse-item name="4">
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
-                ><span
-                  style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-                  >付款信息</span
-                >
-              </i>
-            </template>
-            <div>
-              <div
-                style="
-                  display: flex;
-                  justify-content: space-between;
-                  margin: 10px 0;
-                "
-              >
-                <div>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="addDListRow(CList)"
-                    :disabled="disabled2"
-                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                    >添加</el-button
-                  >
-                </div>
-              </div>
-              <el-table :data="CList">
-                <el-table-column label="结算单位" align="center" prop="fCorpid">
-                  <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.fCorpid"
-                      placeholder="结算单位"
-                      :clearable="true"
-                      filterable
-                      :disabled="disabled2"
-                    >
-                      <el-option
-                        v-for="(dict, index) in fMblnoOptions"
-                        :key="index.fId"
-                        :label="dict.fName"
-                        :value="dict.fId"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="费用名称" align="center" prop="fFeeid">
-                  <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.fFeeid"
-                      placeholder="费用名称"
-                      clearable
-                      filterable
-                      :disabled="disabled2"
-                    >
-                      <el-option
-                        v-for="(dict, index) in fWbuOptions"
-                        :key="index.fId"
-                        :label="dict.fName"
-                        :value="dict.fId"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="计费单位"
-                  align="center"
-                  prop="fFeeunitid"
-                >
-                  <template slot-scope="scope">
-                    <el-select
-                      v-model="scope.row.fFeeunitid"
-                      placeholder="计费单位"
-                      :disabled="disabled2"
-                    >
-                      <el-option
-                        v-for="(dict, index) in ffeeunitidList"
-                        :key="index.dictValue"
-                        :label="dict.dictLabel"
-                        :value="dict.dictValue"
-                      />
-                    </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column label="计费数量" align="center" prop="fQty">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fQty"
-                      placeholder="计费数量"
-                      v-input-limit="0"
-                      :disabled="disabled2"
-                      @input="total(scope.row)"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="单价" align="center" prop="fUnitprice">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fUnitprice"
-                      placeholder="单价"
-                      v-input-limit="2"
-                      :disabled="disabled2"
-                      @input="total(scope.row)"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="币种" align="center" prop="fCurrency">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fCurrency"
-                      placeholder="RMB"
-                      :disabled="true"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="汇率" align="center" prop="fExrate">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fExrate"
-                      placeholder="汇率"
-                      v-input-limit="2"
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="金额" align="center" prop="fAmount">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fAmount"
-                      placeholder="金额"
-                      v-input-limit="2"
-                      :disabled="true"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column label="税率" align="center" prop="fTaxrate">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.fTaxrate"
-                      placeholder="税率"
-                      v-input-limit="2"
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-
-                <el-table-column label="备注" align="center" prop="remarks">
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.remarks"
-                      placeholder="备注"
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  label="操作"
-                  align="center"
-                  class-name="small-padding fixed-width"
-                  width="100"
-                >
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      @click.native.prevent="deleteRow(scope.$index, DList)"
-                      :disabled="disabled2"
-                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                      >删除</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-collapse-item>
-          <el-collapse-item name="5">
-            <template slot="title">
-              <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
-                ><span
-                  style="font-size: 16px; font-weight: bolder; margin-left: 5px"
-                  >附件上传</span
-                >
-              </i>
-            </template>
-            <div>
-              <div
-                style="
-                  display: flex;
-                  justify-content: space-between;
-                  margin: 10px 0;
-                "
-              >
-                <div>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-plus"
-                    size="mini"
-                    @click="addRelevt"
-                    :disabled="disabled2"
-                    v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                    >添加</el-button
-                  >
-                </div>
-              </div>
-              <el-table
-                :data="relevantAttachments"
-                tooltip-effect="dark"
-                border
-                stripe
-                style="width: 100%"
-                height="150"
-              >
-                <el-table-column label="序号" type="index" width="80">
-                </el-table-column>
-                <el-table-column
-                  prop="attachName"
-                  header-align="center"
-                  align="center"
-                  label="附件名称"
-                >
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.attachName"
-                      placeholder="附件名称"
-                      show-word-limit
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="createBy "
-                  header-align="center"
-                  align="center"
-                  label="上传人"
-                >
-                  <template slot-scope="scope">
-                    <el-input
-                      v-model="scope.row.createBy"
-                      placeholder="上传人"
-                      show-word-limit
-                      :disabled="disabled2"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="createTime"
-                  header-align="center"
-                  align="center"
-                  label="上传时间"
-                >
-                  <template slot-scope="scope">
-                    <el-date-picker
-                      v-model="scope.row.createTime"
-                      type="datetime"
-                      placeholder="上传时间"
-                      disabled
-                    ></el-date-picker>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="attachUrl"
-                  header-align="center"
-                  align="center"
-                  label="上传附件"
-                >
-                  <template slot-scope="scope">
-                    <div style="display: flex; justify-content: center">
-                      <el-upload
-                        class="upload-demo"
-                        :action="uploadImgUrl"
-                        :on-success="
-                          (res, file) => {
-                            handleSucces(scope, res, file);
-                          }
-                        "
-                        :headers="headers"
-                        :disabled="disabled2"
-                        :show-file-list="false"
-                        :limit="1"
-                      >
-                        <el-button
-                          size="small"
-                          type="text"
-                          :disabled="disabled2"
-                          v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                          >点击上传</el-button
-                        >
-                      </el-upload>
-                      <el-button
-                        size="small"
-                        type="text"
-                        @click="checkFile(scope)"
-                        :disabled="disabled2"
-                        style="margin-left: 10px"
-                        >查看</el-button
-                      >
-                      <el-button
-                        size="small"
-                        type="text"
-                        :disabled="disabled2"
-                        @click="deleteFile(scope)"
-                        v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                        >删除</el-button
-                      >
-                    </div>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  header-align="center"
-                  align="center"
-                  label="操作"
-                  width="130PX"
-                >
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-delete"
-                      @click.native.prevent="
-                        deleteRow(scope.$index, relevantAttachments)
-                      "
-                      :disabled="disabled2"
-                      v-hasPermi="['fleet:ftmsorderbillsplans:edit']"
-                      >删除</el-button
-                    >
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-collapse-item>
         </el-collapse>
       </el-form>
     </span>
@@ -1590,56 +1075,11 @@ export default {
         (item) => arr1Ids.indexOf(item.dictValue) > -1
       );
     },
-    // 新增附件上传
-    addRelevt() {
-      this.relevantAttachments.push({
-        attachUrl: null,
-        attachName: null,
-        createBy: this.username,
-        createTime: Date.parse(new Date()),
-      });
-    },
-    //附件删除
-    deleteFile(scope) {
-      this.relevantAttachments[scope.$index].attachName = "";
-      this.relevantAttachments[scope.$index].attachUrl = "";
-      if (this.relevantAttachments[scope.$index].attachUrl === "") {
-        this.$message.success("删除成功");
-      } else {
-        this.$message.error("未知错误，删除失败");
-      }
-    },
-    //附件查看
-    checkFile(scope) {
-      if (this.relevantAttachments[scope.$index].attachUrl) {
-        window.open(this.relevantAttachments[scope.$index].attachUrl);
-      } else {
-        this.$message.error("请上传附件");
-      }
-    },
-    //附件上传
-    handleSucces(scope, res, file) {
-      this.relevantAttachments[scope.$index].attachName = res.fileName;
-      this.relevantAttachments[scope.$index].attachUrl = res.url;
-      if (this.relevantAttachments[scope.$index].attachUrl === "") {
-        this.$message.error("上传失败");
-      } else {
-        this.$message.success("上传成功");
-      }
-    },
     // 添加行
     addRow(tableData, event) {
       var obj = {};
       tableData.push(obj);
     },
-    addDListRow(tableData, event) {
-      var obj = { fcorpid: this.form.corpId, fcurrency: "RMB", fExrate: "1" };
-      tableData.push(obj);
-    },
-    //删除行
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
     deleteplansRow(index, rows, row) {
       let arr = this.schedulingList;
       let arr2 = arr.filter((e) => e.cntrId == row.cntrId && e.cntrId != null);
@@ -1652,13 +1092,6 @@ export default {
         rows.splice(index, 1);
       }
     },
-    // 上传成功返回数据
-    showFile(row) {
-      for (let list in this.relevantAttachments) {
-        this.$set(this.relevantAttachments[list], "attachUrl", row.url);
-        this.$set(this.relevantAttachments[list], "attachName", row.fileName);
-      }
-    },
     // 弹出框关闭后触发
     handleClose() {
       // 子组件调用父组件方法，并传递参数
@@ -1688,12 +1121,12 @@ export default {
             formData.append("tmsorder", JSON.stringify(this.form));
             formData.append(
               "attachs",
-              JSON.stringify(this.relevantAttachments)
+              JSON.stringify([])
             );
             formData.append("scntrs", JSON.stringify(this.planList));
             formData.append(
               "fees",
-              JSON.stringify(this.DList.concat(this.CList))
+              JSON.stringify([])
             );
             formData.append("plans", JSON.stringify(this.schedulingList));
             addFtmsorderbillsplans(formData).then((response) => {
@@ -1710,17 +1143,11 @@ export default {
     },
     //保存
     submitSave() {
-      this.DList.map((e) => {
-        return (e.fDc = "D");
-      });
-      this.CList.map((e) => {
-        return (e.fDc = "C");
-      });
       let formData = new window.FormData();
       formData.append("tmsorder", JSON.stringify(this.form));
-      formData.append("attachs", JSON.stringify(this.relevantAttachments));
+      formData.append("attachs", JSON.stringify([]));
       formData.append("scntrs", JSON.stringify(this.planList));
-      formData.append("fees", JSON.stringify(this.DList.concat(this.CList)));
+      formData.append("fees", JSON.stringify([]));
       formData.append("plans", JSON.stringify(this.schedulingList));
       saveFtmsorderbillsplans(formData).then((response) => {
         if (response.code == 200) {
@@ -1879,13 +1306,6 @@ export default {
         this.$message.error("请勿重复变更");
       }
     },
-    total(row) {
-      if (row.fQty && row.fUnitprice) {
-        this.$set(row, "fAmount", (row.fQty * row.fUnitprice).toFixed(2));
-      } else {
-        this.$set(row, "fAmount", 0);
-      }
-    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/track/cabinet/index.vue

@@ -16,7 +16,7 @@
               clearable
               size="small"
               @keyup.enter.native="handleQuery()"
-              style="max-width: 187px"
+              style="width: 100%"
             />
           </el-form-item>
         </el-col>
@@ -28,6 +28,7 @@
               clearable
               size="small"
               filterable
+              style="width: 100%"
             >
               <el-option
                 v-for="(dict, index) in fMblnoOptions"
@@ -44,6 +45,7 @@
               placeholder="请选择业务类型"
               clearable
               size="small"
+              style="width: 100%"
             >
               <el-option
                 v-for="(dict, index) in billTypeList"
@@ -61,6 +63,7 @@
               placeholder="请选择运输方式"
               clearable
               size="small"
+              style="width: 100%"
             >
               <el-option
                 v-for="(dict, index) in transTypeList"
@@ -86,6 +89,7 @@
                   placeholder="请选择运输性质"
                   clearable
                   size="small"
+                  style="width: 100%"
                 >
                   <el-option
                     v-for="(dict, index) in transPropList"
@@ -104,6 +108,7 @@
                   clearable
                   size="small"
                   filterable
+                  style="width: 100%"
                 >
                   <el-option
                     v-for="(dict, index) in goodsOptions"
@@ -115,6 +120,56 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
+              <el-form-item label="单据类型" prop="billKind">
+                <el-select
+                  style="width: 100%"
+                  v-model="queryParams.billKind"
+                  placeholder="请选择单据类型"
+                >
+                  <el-option label="直单" value="NN"></el-option>
+                  <el-option label="主单" value="MM"></el-option>
+                  <el-option label="从单" value="MH"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6"
+              ><el-form-item label-width="100px" label="车号" prop="carregNo">
+                <el-input
+                  v-model="queryParams.carregNo"
+                  placeholder="请输入车号"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery()"
+                  style="width: 100%"
+                /> </el-form-item
+            ></el-col>
+            <el-col :span="6"
+              ><el-form-item
+                label-width="100px"
+                label="主运单号"
+                prop="mBillNo"
+              >
+                <el-input
+                  v-model="queryParams.mBillNo"
+                  placeholder="请输入主运单号"
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery()"
+                  style="width: 100%"
+                /> </el-form-item
+            ></el-col>
+            <el-col :span="6"
+              ><el-form-item label-width="100px" label="运单号" prop="orderNo">
+                <el-input
+                  v-model="queryParams.orderNo"
+                  placeholder="请输入运单号 "
+                  clearable
+                  size="small"
+                  @keyup.enter.native="handleQuery()"
+                  style="width: 100%"
+                /> </el-form-item
+            ></el-col>
+            <el-col :span="6">
               <el-form-item
                 label-width="100px"
                 label="提箱地点"
@@ -126,7 +181,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery()"
-                  style="max-width: 187px"
+                  style="width: 100%"
                 />
               </el-form-item>
             </el-col>
@@ -142,11 +197,9 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery()"
-                  style="max-width: 187px"
+                  style="width: 100%"
                 /> </el-form-item
             ></el-col>
-          </el-row>
-          <el-row>
             <el-col :span="6"
               ><el-form-item
                 label-width="100px"
@@ -159,7 +212,7 @@
                   clearable
                   size="small"
                   @keyup.enter.native="handleQuery()"
-                  style="max-width: 187px"
+                  style="width: 100%"
                 /> </el-form-item
             ></el-col>
             <el-col :span="6">
@@ -179,6 +232,29 @@
                   :picker-options="pickerOptions"
                   value-format="yyyy-MM-dd HH:mm-ss"
                   :default-time="['00:00:00', '23:59:59']"
+                  style="width: 100%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                label-width="100px"
+                label="接单日期"
+                prop="acceptDateList"
+              >
+                <el-date-picker
+                  v-model="queryParams.acceptDateList"
+                  type="daterange"
+                  align="right"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd HH:mm-ss"
+                  :default-time="['00:00:00', '23:59:59']"
+                  style="width: 100%"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -244,8 +320,8 @@
       </el-col>
       <el-col :span="1.5"
         ><el-badge
-        :value="buttonValue.unLoadDate"
-        type="warning"
+          :value="buttonValue.unLoadDate"
+          type="warning"
           style="margin-right: 10px"
           ><el-button size="mini" @click="handleQuery('unLoadDate')"
             >未回单</el-button
@@ -253,9 +329,7 @@
         ></el-col
       >
       <el-col :span="1.5"
-        ><el-badge
-          type="warning"
-          style="margin-right: 10px"
+        ><el-badge type="warning" style="margin-right: 10px"
           ><el-button size="mini" @click="handleQuery('receiptDate')"
             >已完成</el-button
           ></el-badge
@@ -424,6 +498,7 @@
       :disabled="disabled"
       :feesList="feesList"
       :allfMblnoOptions="allfMblnoOptions"
+      :carsTable="carsTable"
       @changeShow="showAddOrUpdate"
       @fixDisabled="fixDisabled"
       ref="addOrUpdateRef"
@@ -443,7 +518,7 @@ import {
   selectDriverFtmsorderbillscars,
 } from "@/api/fleet/ftmsorderbillscars";
 import { listGoods } from "@/api/basicdata/goods";
-import { listCorps ,selectCorpList} from "@/api/basicdata/corps";
+import { listCorps, selectCorpList } from "@/api/basicdata/corps";
 import { addSet, select, resetModule } from "@/api/system/set";
 import Cookies from "js-cookie";
 import draggable from "vuedraggable";
@@ -484,7 +559,7 @@ export default {
           },
         ],
       },
-      feesList:[],
+      feesList: [],
       // 控制新增编辑弹窗的显示与隐藏
       addOrUpdateVisible: false,
       // 非单个禁用
@@ -774,7 +849,7 @@ export default {
         {
           surface: "37",
           label: "mBillNo",
-          name: "主单号",
+          name: "主运单号",
           checked: 0,
           width: 100,
         },
@@ -792,7 +867,8 @@ export default {
       billTypeList: [],
       show: false,
       buttonValue: {},
-      allfMblnoOptions:[]
+      allfMblnoOptions: [],
+      carsTable: {},
     };
   },
   // 使用子组件
@@ -831,7 +907,7 @@ export default {
         this.form = response.data.cars;
         this.relevantAttachments = response.data.attachs;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
-        this.feesList=[]
+        this.feesList = [];
       });
     }
   },
@@ -1025,8 +1101,8 @@ export default {
       this.disabled = false;
       this.resetForm("form");
       this.relevantAttachments = [];
-      this.allfMblnoOptions=[]
-      this.feesList=[]
+      this.allfMblnoOptions = [];
+      this.feesList = [];
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1045,16 +1121,17 @@ 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();
+        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;
-        this.feesList=response.data.feesList;
+        this.feesList = response.data.feesList;
         this.addOrUpdateVisible = !this.addOrUpdateVisible;
+        this.carsTable = response.data.carsTable;
       });
     },
     /** 删除按钮操作 */