Browse Source

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

wengyuwen 4 years ago
parent
commit
ed080f81cc

+ 1 - 1
src/views/chiCard.vue

@@ -59,7 +59,7 @@ export default {
       display: flex;
       i {
         align-self: center;
-        font-size: 24px;
+        font-size: 20px;
       }
       div {
         align-self: center;

+ 1 - 1
src/views/fleet/scheduling/index.vue

@@ -871,7 +871,7 @@ export default {
             if (e.cntrId) {
               e.cntrId = e.cntrId.toString();
             }
-            if (e.billStatus == 6 || e.billStatus == 3) {
+            if (e.billStatus >= 6 || e.billStatus == 3) {
               e.disabled = true;
             }
           });

+ 6 - 3
src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1691,9 +1691,12 @@ export default {
       this.vehicleList.map((e) => {
         return (e.carcorPid = this.schedulingList[0].carcorPid);
       });
-      let arr = [];
-      arr = this.vehicleList.filter((e) => e.billStatus == 6);
-      console.log(arr);
+      let arr2 = [];
+      let arr = this.vehicleList.filter((e) => e.billStatus == 6);
+      arr.map((a) => {
+        arr2.push(a.carregNo);
+      });
+      this.schedulingList[0]["carnolist"] = [...new Set(arr2)].join("/");
       let formData = new window.FormData();
       formData.append("cars", JSON.stringify(this.vehicleList));
       formData.append("attachs", JSON.stringify(this.relevantAttachments));

+ 12 - 12
src/views/fleet/sendcar/index.vue

@@ -9,18 +9,18 @@
     >
       <el-row>
         <el-col :span="6">
-          <el-col :span="6">
-            <el-form-item label-width="100px" label="提单号" prop="mblno">
-              <el-input
-                v-model="queryParams.mblno"
-                placeholder="请输入提单号"
-                clearable
-                size="small"
-                @keyup.enter.native="handleQuery"
-                style="max-width: 187px"
-              />
-            </el-form-item>
-          </el-col>
+          <el-form-item label-width="100px" label="提单号" prop="mblno">
+            <el-input
+              v-model="queryParams.mblno"
+              placeholder="请输入提单号"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+              style="max-width: 187px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="客户名称" prop="corpId">
             <el-select
               v-model="queryParams.corpId"

+ 18 - 17
src/views/index.vue

@@ -6,7 +6,7 @@
           <div slot="content">
             <div class="content-top">
               <div class="content-top-left">
-                <div style="display: flex; align-self: flex-start">
+                <div style="display: flex; align-self: center;margin-left: 5px">
                   <div style="align-self: center">
                     <svg
                       t="1616396514864"
@@ -36,7 +36,7 @@
                   </div>
                 </div>
                 <div
-                  style="font-size: 36px; align-self: center; font-weight: 600"
+                  style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
                 >
                   {{ upperLeftCntrs.planQuantity }}
                 </div>
@@ -45,8 +45,9 @@
                 <div
                   style="
                     display: flex;
-                    align-self: flex-start;
+                    align-self: center;
                     min-width: 120px;
+                    margin-left: 5px
                   "
                 >
                   <div style="align-self: center">
@@ -77,14 +78,14 @@
                   </div>
                 </div>
                 <div
-                  style="font-size: 36px; align-self: center; font-weight: 600"
+                  style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
                 >
                   {{ upperLeftCntrs.surplusQuantity }}
                 </div>
               </div>
             </div>
             <div class="content-bottom">
-              <div style="display: flex; align-self: flex-start">
+              <div style="display: flex; align-self: center;margin-left: 5px">
                 <div style="align-self: center">
                   <svg
                     t="1616402886142"
@@ -118,7 +119,7 @@
                 </div>
               </div>
               <div
-                style="font-size: 36px; align-self: center; font-weight: 600"
+                style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
               >
                 {{ fleetData.upperLeftCarQuantity }}
               </div>
@@ -126,7 +127,7 @@
             </div>
             <div class="content-bottom">
               <div
-                style="display: flex; align-self: flex-start; min-width: 120px"
+                style="display: flex; align-self:center; min-width: 120px;margin-left: 5px"
               >
                 <div style="align-self: center">
                   <svg
@@ -157,7 +158,7 @@
                 </div>
               </div>
               <div
-                style="font-size: 36px; align-self: center; font-weight: 600"
+                style="font-size: 36px; align-self: center; font-weight: 600;color:#014da1"
               >
                 {{ fleetData.upperLeftOldCarQuantity }}
               </div>
@@ -181,11 +182,11 @@
         <chi-card title="运行车辆" iconName="el-icon-s-order" :More="true">
           <div slot="content" class="upper-right">
             <div
-              style="display: flex; padding: 2px; font-size: 16px"
+              style="display: flex; padding: 4px 15px; font-size: 14px"
               v-for="(item, index) in fleetData.upperRight"
               :key="index"
               :style="{
-                backgroundColor: index % 2 == 0 ? '#e6ebf5' : '#FFFFFF',
+                backgroundColor: index % 2 == 0 ? '#fafbfd' : '#FFFFFF',
               }"
             >
               <div style="width: 30%">{{ item.mblno }}</div>
@@ -210,9 +211,9 @@
           <div slot="content" class="upper-right">
             <div
               style="
-                font-size: 16px;
+                font-size: 14px;
                 display: flex;
-                margin: 4px 0;
+                margin: 4px 15px;
                 border-bottom: 1px dashed #e6ebf5;
               "
             >
@@ -222,7 +223,7 @@
               <div style="width: 15%; color: #67c23a" class="single_line">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 16px; display: flex; margin: 4px 0">
+            <div style="font-size: 14px; display: flex; margin: 4px 15px;">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
@@ -235,9 +236,9 @@
           <div slot="content" class="upper-right">
             <div
               style="
-                font-size: 16px;
+                font-size: 14px;
                 display: flex;
-                margin: 4px 0;
+                margin: 4px 15px;
                 border-bottom: 1px dashed #e6ebf5;
               "
             >
@@ -247,7 +248,7 @@
               <div style="width: 15%; color: #67c23a">待审批</div>
               <div style="width: 20%" class="single_line">2020/10/10</div>
             </div>
-            <div style="font-size: 16px; display: flex; margin: 4px 0">
+            <div style="font-size: 14px; display: flex; margin: 4px 15px;">
               <div style="width: 30%" class="single_line">FK221516485645</div>
               <div style="width: 20%" class="single_line">运费运费运费</div>
               <div style="width: 15%" class="single_line">李刚</div>
@@ -1139,7 +1140,7 @@ export default {
     justify-content: space-between;
   }
   .upper-right {
-    padding: 10px;
+    padding: 10px 0;
     min-height: 144px;
   }
 }

+ 202 - 200
src/views/track/cabinet/AddOrUpdate.vue

@@ -342,8 +342,61 @@
             </el-form-item>
           </el-col>
         </el-row>
+     
         <el-row>
           <el-col :span="6">
+            <el-form-item label="起始里程" prop="odometerFrom">
+              <el-input
+                v-model="form.odometerFrom"
+                placeholder="请输入起始里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束里程" prop="odometerEnd">
+              <el-input
+                v-model="form.odometerEnd"
+                placeholder="请输入结束里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="还卸柜时间" prop="unLoadDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.unLoadDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择还卸柜时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
+              <el-input
+                v-model="form.unLoadRemarks"
+                placeholder="请输入还卸柜备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+           <el-row>
+          <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
                 clearable
@@ -421,58 +474,6 @@
         </el-row>
         <el-row>
           <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom">
-              <el-input
-                v-model="form.odometerFrom"
-                placeholder="请输入起始里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd">
-              <el-input
-                v-model="form.odometerEnd"
-                placeholder="请输入结束里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="还卸柜时间" prop="unLoadDate">
-              <el-date-picker
-                clearable
-                size="mini"
-                style="width: 180px"
-                v-model="form.unLoadDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择还卸柜时间"
-                :disabled="disabled"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="还卸柜备注" prop="unLoadRemarks">
-              <el-input
-                v-model="form.unLoadRemarks"
-                placeholder="请输入还卸柜备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
             <el-form-item label="油气费" prop="oilAmt">
               <el-input
                 v-model="form.oilAmt"
@@ -620,154 +621,7 @@
         </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        <el-collapse-item>
-          <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="disabled"
-                  >添加</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
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opuserID "
-                header-align="center"
-                align="center"
-                label="上传人"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    v-model="scope.row.opuserID"
-                    placeholder="上传人"
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opdata"
-                header-align="center"
-                align="center"
-                label="上传时间"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    v-model="scope.row.opdata"
-                    type="date"
-                    disabled
-                    placeholder="上传时间"
-                    format="yyyy-MM-dd HH:mm"
-                    value-format="timestamp"
-                  ></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="disabled"
-                      :show-file-list="false"
-                      :limit="1"
-                    >
-                      <el-button size="small" type="text" :disabled="disabled"
-                        >点击上传</el-button
-                      >
-                    </el-upload>
-                    <el-button
-                      size="small"
-                      type="text"
-                      @click="checkFile(scope)"
-                      :disabled="disabled"
-                      style="margin-left: 10px"
-                      >查看</el-button
-                    >
-                    <el-button
-                      size="small"
-                      type="text"
-                      :disabled="disabled"
-                      @click="deleteFile(scope)"
-                      >删除</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="disabled"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-collapse-item>
+       
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -1124,6 +978,154 @@
             </el-table>
           </div>
         </el-collapse-item>
+         <el-collapse-item>
+          <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="disabled"
+                  >添加</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
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opuserID "
+                header-align="center"
+                align="center"
+                label="上传人"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.opuserID"
+                    placeholder="上传人"
+                    show-word-limit
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opdata"
+                header-align="center"
+                align="center"
+                label="上传时间"
+              >
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="scope.row.opdata"
+                    type="date"
+                    disabled
+                    placeholder="上传时间"
+                    format="yyyy-MM-dd HH:mm"
+                    value-format="timestamp"
+                  ></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="disabled"
+                      :show-file-list="false"
+                      :limit="1"
+                    >
+                      <el-button size="small" type="text" :disabled="disabled"
+                        >点击上传</el-button
+                      >
+                    </el-upload>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="checkFile(scope)"
+                      :disabled="disabled"
+                      style="margin-left: 10px"
+                      >查看</el-button
+                    >
+                    <el-button
+                      size="small"
+                      type="text"
+                      :disabled="disabled"
+                      @click="deleteFile(scope)"
+                      >删除</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="disabled"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">

+ 30 - 2
src/views/track/cabinet/index.vue

@@ -470,7 +470,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -552,6 +552,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -599,7 +613,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -681,6 +695,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

+ 202 - 200
src/views/track/goods/AddOrUpdate.vue

@@ -342,6 +342,59 @@
             </el-form-item>
           </el-col>
         </el-row>
+        
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="起始里程" prop="odometerFrom">
+              <el-input
+                v-model="form.odometerFrom"
+                placeholder="请输入起始里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束里程" prop="odometerEnd">
+              <el-input
+                v-model="form.odometerEnd"
+                placeholder="请输入结束里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="装卸货时间" prop="mdLoadDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.mdLoadDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择装卸货时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="装卸货备注" prop="mdLoadRemarks">
+              <el-input
+                v-model="form.mdLoadRemarks"
+                placeholder="请输入装卸货备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
@@ -419,208 +472,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom">
-              <el-input
-                v-model="form.odometerFrom"
-                placeholder="请输入起始里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd">
-              <el-input
-                v-model="form.odometerEnd"
-                placeholder="请输入结束里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="装卸货时间" prop="mdLoadDate">
-              <el-date-picker
-                clearable
-                size="mini"
-                style="width: 180px"
-                v-model="form.mdLoadDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择装卸货时间"
-                :disabled="disabled"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="装卸货备注" prop="mdLoadRemarks">
-              <el-input
-                v-model="form.mdLoadRemarks"
-                placeholder="请输入装卸货备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        <el-collapse-item>
-          <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="disabled"
-                  >添加</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
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opuserID "
-                header-align="center"
-                align="center"
-                label="上传人"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    v-model="scope.row.opuserID"
-                    placeholder="上传人"
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opdata"
-                header-align="center"
-                align="center"
-                label="上传时间"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    v-model="scope.row.opdata"
-                    type="date"
-                    disabled
-                    placeholder="上传时间"
-                    format="yyyy-MM-dd HH:mm"
-                    value-format="timestamp"
-                  ></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="disabled"
-                      :show-file-list="false"
-                      :limit="1"
-                    >
-                      <el-button size="small" type="text" :disabled="disabled"
-                        >点击上传</el-button
-                      >
-                    </el-upload>
-                    <el-button
-                      size="small"
-                      type="text"
-                      @click="checkFile(scope)"
-                      :disabled="disabled"
-                      style="margin-left: 10px"
-                      >查看</el-button
-                    >
-                    <el-button
-                      size="small"
-                      type="text"
-                      :disabled="disabled"
-                      @click="deleteFile(scope)"
-                      >删除</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="disabled"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-collapse-item>
+        
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -977,6 +831,154 @@
             </el-table>
           </div>
         </el-collapse-item>
+        <el-collapse-item>
+          <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="disabled"
+                  >添加</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
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opuserID "
+                header-align="center"
+                align="center"
+                label="上传人"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.opuserID"
+                    placeholder="上传人"
+                    show-word-limit
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opdata"
+                header-align="center"
+                align="center"
+                label="上传时间"
+              >
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="scope.row.opdata"
+                    type="date"
+                    disabled
+                    placeholder="上传时间"
+                    format="yyyy-MM-dd HH:mm"
+                    value-format="timestamp"
+                  ></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="disabled"
+                      :show-file-list="false"
+                      :limit="1"
+                    >
+                      <el-button size="small" type="text" :disabled="disabled"
+                        >点击上传</el-button
+                      >
+                    </el-upload>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="checkFile(scope)"
+                      :disabled="disabled"
+                      style="margin-left: 10px"
+                      >查看</el-button
+                    >
+                    <el-button
+                      size="small"
+                      type="text"
+                      :disabled="disabled"
+                      @click="deleteFile(scope)"
+                      >删除</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="disabled"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">

+ 33 - 5
src/views/track/goods/index.vue

@@ -71,7 +71,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        
+
       </el-row>
       <el-collapse-transition>
         <div v-show="show">
@@ -467,10 +467,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -549,6 +549,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -596,10 +610,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -678,6 +692,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

+ 202 - 200
src/views/track/meetSingle/AddOrUpdate.vue

@@ -342,7 +342,60 @@
             </el-form-item>
           </el-col>
         </el-row>
+       
         <el-row>
+          <el-col :span="6">
+            <el-form-item label="起始里程" prop="odometerFrom">
+              <el-input
+                v-model="form.odometerFrom"
+                placeholder="请输入起始里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束里程" prop="odometerEnd">
+              <el-input
+                v-model="form.odometerEnd"
+                placeholder="请输入结束里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="接单时间" prop="acceptDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.acceptDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择接单时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="接单备注" prop="acceptRemarks">
+              <el-input
+                v-model="form.acceptRemarks"
+                placeholder="请输入接单备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+         <el-row>
           <!-- <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
@@ -419,208 +472,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom">
-              <el-input
-                v-model="form.odometerFrom"
-                placeholder="请输入起始里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd">
-              <el-input
-                v-model="form.odometerEnd"
-                placeholder="请输入结束里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="接单时间" prop="acceptDate">
-              <el-date-picker
-                clearable
-                size="mini"
-                style="width: 180px"
-                v-model="form.acceptDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择接单时间"
-                :disabled="disabled"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="接单备注" prop="acceptRemarks">
-              <el-input
-                v-model="form.acceptRemarks"
-                placeholder="请输入接单备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        <el-collapse-item>
-          <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="disabled"
-                  >添加</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
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opuserID "
-                header-align="center"
-                align="center"
-                label="上传人"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    v-model="scope.row.opuserID"
-                    placeholder="上传人"
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opdata"
-                header-align="center"
-                align="center"
-                label="上传时间"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    v-model="scope.row.opdata"
-                    type="date"
-                    disabled
-                    placeholder="上传时间"
-                    format="yyyy-MM-dd HH:mm"
-                    value-format="timestamp"
-                  ></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="disabled"
-                      :show-file-list="false"
-                      :limit="1"
-                    >
-                      <el-button size="small" type="text" :disabled="disabled"
-                        >点击上传</el-button
-                      >
-                    </el-upload>
-                    <el-button
-                      size="small"
-                      type="text"
-                      @click="checkFile(scope)"
-                      :disabled="disabled"
-                      style="margin-left: 10px"
-                      >查看</el-button
-                    >
-                    <el-button
-                      size="small"
-                      type="text"
-                      :disabled="disabled"
-                      @click="deleteFile(scope)"
-                      >删除</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="disabled"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-collapse-item>
+       
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -977,6 +831,154 @@
             </el-table>
           </div>
         </el-collapse-item>
+         <el-collapse-item>
+          <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="disabled"
+                  >添加</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
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opuserID "
+                header-align="center"
+                align="center"
+                label="上传人"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.opuserID"
+                    placeholder="上传人"
+                    show-word-limit
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opdata"
+                header-align="center"
+                align="center"
+                label="上传时间"
+              >
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="scope.row.opdata"
+                    type="date"
+                    disabled
+                    placeholder="上传时间"
+                    format="yyyy-MM-dd HH:mm"
+                    value-format="timestamp"
+                  ></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="disabled"
+                      :show-file-list="false"
+                      :limit="1"
+                    >
+                      <el-button size="small" type="text" :disabled="disabled"
+                        >点击上传</el-button
+                      >
+                    </el-upload>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="checkFile(scope)"
+                      :disabled="disabled"
+                      style="margin-left: 10px"
+                      >查看</el-button
+                    >
+                    <el-button
+                      size="small"
+                      type="text"
+                      :disabled="disabled"
+                      @click="deleteFile(scope)"
+                      >删除</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="disabled"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">

+ 14 - 0
src/views/track/meetSingle/index.vue

@@ -557,6 +557,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -693,6 +700,13 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

+ 202 - 200
src/views/track/receipt/AddOrUpdate.vue

@@ -342,8 +342,61 @@
             </el-form-item>
           </el-col>
         </el-row>
+     
         <el-row>
           <el-col :span="6">
+            <el-form-item label="起始里程" prop="odometerFrom">
+              <el-input
+                v-model="form.odometerFrom"
+                placeholder="请输入起始里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束里程" prop="odometerEnd">
+              <el-input
+                v-model="form.odometerEnd"
+                placeholder="请输入结束里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="回单时间" prop="waybillDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.waybillDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择回单时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="回单备注" prop="waybillRemarks">
+              <el-input
+                v-model="form.waybillRemarks"
+                placeholder="请输入回单备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+           <el-row>
+          <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
               <el-date-picker
                 clearable
@@ -419,208 +472,9 @@
             </el-form-item>
           </el-col> -->
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom">
-              <el-input
-                v-model="form.odometerFrom"
-                placeholder="请输入起始里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd">
-              <el-input
-                v-model="form.odometerEnd"
-                placeholder="请输入结束里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="回单时间" prop="waybillDate">
-              <el-date-picker
-                clearable
-                size="mini"
-                style="width: 180px"
-                v-model="form.waybillDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择回单时间"
-                :disabled="disabled"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="回单备注" prop="waybillRemarks">
-              <el-input
-                v-model="form.waybillRemarks"
-                placeholder="请输入回单备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        <el-collapse-item>
-          <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="disabled"
-                  >添加</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
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opuserID "
-                header-align="center"
-                align="center"
-                label="上传人"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    v-model="scope.row.opuserID"
-                    placeholder="上传人"
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opdata"
-                header-align="center"
-                align="center"
-                label="上传时间"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    v-model="scope.row.opdata"
-                    type="date"
-                    disabled
-                    placeholder="上传时间"
-                    format="yyyy-MM-dd HH:mm"
-                    value-format="timestamp"
-                  ></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="disabled"
-                      :show-file-list="false"
-                      :limit="1"
-                    >
-                      <el-button size="small" type="text" :disabled="disabled"
-                        >点击上传</el-button
-                      >
-                    </el-upload>
-                    <el-button
-                      size="small"
-                      type="text"
-                      @click="checkFile(scope)"
-                      :disabled="disabled"
-                      style="margin-left: 10px"
-                      >查看</el-button
-                    >
-                    <el-button
-                      size="small"
-                      type="text"
-                      :disabled="disabled"
-                      @click="deleteFile(scope)"
-                      >删除</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="disabled"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-collapse-item>
+       
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -977,6 +831,154 @@
             </el-table>
           </div>
         </el-collapse-item>
+         <el-collapse-item>
+          <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="disabled"
+                  >添加</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
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opuserID "
+                header-align="center"
+                align="center"
+                label="上传人"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.opuserID"
+                    placeholder="上传人"
+                    show-word-limit
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opdata"
+                header-align="center"
+                align="center"
+                label="上传时间"
+              >
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="scope.row.opdata"
+                    type="date"
+                    disabled
+                    placeholder="上传时间"
+                    format="yyyy-MM-dd HH:mm"
+                    value-format="timestamp"
+                  ></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="disabled"
+                      :show-file-list="false"
+                      :limit="1"
+                    >
+                      <el-button size="small" type="text" :disabled="disabled"
+                        >点击上传</el-button
+                      >
+                    </el-upload>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="checkFile(scope)"
+                      :disabled="disabled"
+                      style="margin-left: 10px"
+                      >查看</el-button
+                    >
+                    <el-button
+                      size="small"
+                      type="text"
+                      :disabled="disabled"
+                      @click="deleteFile(scope)"
+                      >删除</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="disabled"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">

+ 32 - 4
src/views/track/receipt/index.vue

@@ -470,10 +470,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -552,6 +552,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -599,10 +613,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -681,6 +695,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

+ 148 - 1
src/views/track/singleCost/AddOrUpdate.vue

@@ -297,6 +297,153 @@
             </el-form-item>
           </el-col>
         </el-row>
+         <el-row>
+          <el-col :span="6">
+            <el-form-item label="油气费" prop="oilAmt">
+              <el-input
+                v-model="form.oilAmt"
+                placeholder="请输入油气费"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单趟提成" prop="driverbonus">
+              <el-input
+                v-model="form.driverbonus"
+                placeholder="请输入单趟提成"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="其他费用" prop="costOth">
+              <el-input
+                v-model="form.costOth"
+                placeholder="请输入其他费用"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="备注" prop="costRemarks">
+              <el-input
+                v-model="form.costRemarks"
+                placeholder="请输入备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.billType == 1">
+          <el-col :span="6">
+            <el-form-item label="修洗费" prop="costomAmt03">
+              <el-input
+                v-model="form.costomAmt03"
+                placeholder="请输入修洗费"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="吊装费" prop="costomAmt04">
+              <el-input
+                v-model="form.costomAmt04"
+                placeholder="请输入吊装费"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="其他费用" prop="costomAmt02">
+              <el-input
+                v-model="form.costomAmt02"
+                placeholder="请输入其他费用"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="费用备注" prop="costomStr02">
+              <el-input
+                v-model="form.costomStr02"
+                placeholder="请输入备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="form.billType == 2">
+          <el-col :span="6">
+            <el-form-item label="港杂费" prop="costomAmt03">
+              <el-input
+                v-model="form.costomAmt03"
+                placeholder="请输入港杂费"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="提箱费" prop="costomAmt04">
+              <el-input
+                v-model="form.costomAmt04"
+                placeholder="请输入提箱费"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="其他费用" prop="costomAmt01">
+              <el-input
+                v-model="form.costomAmt01"
+                placeholder="请输入其他费用"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="费用备注" prop="costomStr01">
+              <el-input
+                v-model="form.costomStr01"
+                placeholder="请输入备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template slot="title">
         <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -336,7 +483,7 @@
               filterable
               size="mini"
               style="width: 160px"
-              disabled
+              :disabled="scope.row.actId != 1090||disabled"
             >
               <el-option
                 v-for="(dict, index) in fMblnoOptions"

+ 30 - 2
src/views/track/singleCost/index.vue

@@ -421,7 +421,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -503,6 +503,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -550,7 +564,7 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
           fixed: "left",
@@ -632,6 +646,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",

+ 201 - 200
src/views/track/suitcase/AddOrUpdate.vue

@@ -342,6 +342,59 @@
             </el-form-item>
           </el-col>
         </el-row>
+        
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="起始里程" prop="odometerFrom">
+              <el-input
+                v-model="form.odometerFrom"
+                placeholder="请输入起始里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结束里程" prop="odometerEnd">
+              <el-input
+                v-model="form.odometerEnd"
+                placeholder="请输入结束里程表读数"
+                size="mini"
+                style="width: 180px"
+                v-input-limit="2"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="提箱时间" prop="loadDate">
+              <el-date-picker
+                clearable
+                size="mini"
+                style="width: 180px"
+                v-model="form.loadDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择提箱时间"
+                :disabled="disabled"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="提箱备注" prop="loadRemarks">
+              <el-input
+                v-model="form.loadRemarks"
+                placeholder="请输入提箱备注"
+                size="mini"
+                style="width: 180px"
+                :disabled="disabled"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="接单时间" prop="acceptDate">
@@ -419,208 +472,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6">
-            <el-form-item label="起始里程" prop="odometerFrom">
-              <el-input
-                v-model="form.odometerFrom"
-                placeholder="请输入起始里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="结束里程" prop="odometerEnd">
-              <el-input
-                v-model="form.odometerEnd"
-                placeholder="请输入结束里程表读数"
-                size="mini"
-                style="width: 180px"
-                v-input-limit="2"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="提箱时间" prop="loadDate">
-              <el-date-picker
-                clearable
-                size="mini"
-                style="width: 180px"
-                v-model="form.loadDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择提箱时间"
-                :disabled="disabled"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="提箱备注" prop="loadRemarks">
-              <el-input
-                v-model="form.loadRemarks"
-                placeholder="请输入提箱备注"
-                size="mini"
-                style="width: 180px"
-                :disabled="disabled"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
       </el-form>
       <el-collapse v-model="collapses">
-        <el-collapse-item>
-          <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="disabled"
-                  >添加</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
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opuserID "
-                header-align="center"
-                align="center"
-                label="上传人"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    v-model="scope.row.opuserID"
-                    placeholder="上传人"
-                    show-word-limit
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="opdata"
-                header-align="center"
-                align="center"
-                label="上传时间"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    v-model="scope.row.opdata"
-                    type="date"
-                    disabled
-                    placeholder="上传时间"
-                    format="yyyy-MM-dd HH:mm"
-                    value-format="timestamp"
-                  ></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="disabled"
-                      :show-file-list="false"
-                      :limit="1"
-                    >
-                      <el-button size="small" type="text" :disabled="disabled"
-                        >点击上传</el-button
-                      >
-                    </el-upload>
-                    <el-button
-                      size="small"
-                      type="text"
-                      @click="checkFile(scope)"
-                      :disabled="disabled"
-                      style="margin-left: 10px"
-                      >查看</el-button
-                    >
-                    <el-button
-                      size="small"
-                      type="text"
-                      :disabled="disabled"
-                      @click="deleteFile(scope)"
-                      >删除</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="disabled"
-                    >删除</el-button
-                  >
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-collapse-item>
         <el-collapse-item v-if="userType == '00'">
           <template slot="title">
             <i class="header-icon el-icon-circle-plus" style="font-size: 16px"
@@ -977,6 +830,154 @@
             </el-table>
           </div>
         </el-collapse-item>
+          <el-collapse-item>
+          <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="disabled"
+                  >添加</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
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opuserID "
+                header-align="center"
+                align="center"
+                label="上传人"
+              >
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="scope.row.opuserID"
+                    placeholder="上传人"
+                    show-word-limit
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="opdata"
+                header-align="center"
+                align="center"
+                label="上传时间"
+              >
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="scope.row.opdata"
+                    type="date"
+                    disabled
+                    placeholder="上传时间"
+                    format="yyyy-MM-dd HH:mm"
+                    value-format="timestamp"
+                  ></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="disabled"
+                      :show-file-list="false"
+                      :limit="1"
+                    >
+                      <el-button size="small" type="text" :disabled="disabled"
+                        >点击上传</el-button
+                      >
+                    </el-upload>
+                    <el-button
+                      size="small"
+                      type="text"
+                      @click="checkFile(scope)"
+                      :disabled="disabled"
+                      style="margin-left: 10px"
+                      >查看</el-button
+                    >
+                    <el-button
+                      size="small"
+                      type="text"
+                      :disabled="disabled"
+                      @click="deleteFile(scope)"
+                      >删除</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="disabled"
+                    >删除</el-button
+                  >
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-collapse-item>
       </el-collapse>
     </span>
     <span slot="footer" class="dialog-footer">

+ 32 - 4
src/views/track/suitcase/index.vue

@@ -470,10 +470,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -552,6 +552,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       getRowList: [
         {
@@ -599,10 +613,10 @@ export default {
         {
           surface: "7",
           label: "mblno",
-          name: "单号",
+          name: "单号",
           checked: 0,
           width: 100,
-           fixed: "left",
+          fixed: "left",
         },
         {
           surface: "8",
@@ -681,6 +695,20 @@ export default {
           checked: 0,
           width: 100,
         },
+        {
+          surface: "19",
+          label: "orderNo",
+          name: "运单号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "20",
+          label: "driverTel",
+          name: "司机电话",
+          checked: 0,
+          width: 100,
+        },
       ],
       allCheck: false,
       title: "",