修改bug

src/api/basicdata/dept.js

@@ -83,3 +83,12 @@ export function lazyListDept(query) {
     params: query
   })
 }
+
+// 获取url
+export function monitorUrl(data) {
+  return request({
+    url: '/warehouse/webcam/getWebcamUrl',
+    method: 'get',
+    params: data
+  })
+}

src/views/Warehousing/components/upLoadContract.vue

@@ -0,0 +1,220 @@
+<template>
+  <div>
+    <div class="dialogTableTitle flex a-center jlr" style="
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin: 10px 0;
+      ">
+      <div>
+        <el-button size="small" type="primary" :disabled="browseStatus" @click.prevent="addRelevt()">新行
+        </el-button>
+      </div>
+    </div>
+    <el-table :data="relevantAttachments" ref="table" tooltip-effect="dark" stripe style="width: 100%" height="150">
+      <el-table-column label="序号" type="index" width="80"> </el-table-column>
+      <el-table-column prop="fName" header-align="center" align="center" label="附件名称">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.fName" :disabled="browseStatus" placeholder="附件名称" show-word-limit />
+        </template>
+      </el-table-column>
+      <el-table-column prop="fType" header-align="center" align="center" label="文件属性">
+        <template slot-scope="scope">
+          <el-select v-model="scope.row.fType" clearable filterable :disabled="browseStatus"
+            @change="filesTypeChange(scope.row)">
+            <el-option v-for="(item, index) in filesTypeOptions" :value="item.dictValue" :label="item.dictLabel"
+              :key="index"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="cname" header-align="center" align="center" label="合同/协议名称">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.cname" :disabled="browseStatus" placeholder="合同/协议名称" show-word-limit />
+        </template>
+      </el-table-column>
+      <el-table-column prop="effectiveDateStare" header-align="center" align="center" label="有效期起">
+        <template slot-scope="scope">
+          <el-date-picker v-model="scope.row.effectiveDateStare" type="date" placeholder="选择日期" style="width: 100%;">
+          </el-date-picker>
+        </template>
+      </el-table-column>
+      <el-table-column prop="effectiveDateEnd" header-align="center" align="center" label="有效期止">
+        <template slot-scope="scope">
+          <el-date-picker v-model="scope.row.effectiveDateEnd" type="date" placeholder="选择日期"  style="width: 100%;">
+          </el-date-picker>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createBy" header-align="center" align="center" label="上传人">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.createBy" disabled placeholder="上传人" show-word-limit />
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" header-align="center" align="center" label="上传时间">
+        <template slot-scope="scope">
+          <el-date-picker v-model="scope.row.createTime" type="date" disabled placeholder="上传时间" format="yyyy-MM-dd HH:mm"
+            value-format="timestamp"></el-date-picker>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fUrl" 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="browseStatus" :show-file-list="false" :limit="1">
+              <el-button size="small" type="text" :disabled="browseStatus">点击上传</el-button>
+            </el-upload>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column header-align="center" align="center" label="操作" width="130PX" fixed="right">
+        <template slot-scope="scope">
+          <el-button size="small" type="text" @click="checkFile(scope, 0)">查看</el-button>
+          <el-button @click.native.prevent="deleteRow(scope.$index, relevantAttachments)" :disabled="browseStatus"
+            size="small" type="text">删除
+          </el-button>
+          <el-button size="small" type="text" @click="checkFile(scope, 1)">下载</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog width="80%" title="附件" :fullscreen="dialogFull" :visible.sync="innerVisible" append-to-body>
+      <template slot="title">
+        <span class="el-dialog__title">
+          <span
+            style="display:inline-block;background-color: #3478f5;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px"></span>
+          附件
+        </span>
+        <div class="size-change" @click="dialogFull ? dialogFull = false : dialogFull = true">
+          <i class="el-icon-full-screen"></i>
+        </div>
+      </template>
+      <div style="width: 50%;height: 50%;margin: 0 auto">
+        <img :src="url" alt="" style="width: 100%;height: 100%;">
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@/utils/auth";
+import { deleteAttachment } from "@/api/index";
+export default {
+  props: {
+    relevantAttachments: {
+      type: Array,
+      default: [],
+    },
+    createBy: {
+      type: String,
+      default: null,
+    },
+    browseStatus: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  data() {
+    return {
+      innerVisible: false,
+      url: '',
+      dialogFull: false,
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      filesTypeOptions: [],
+      repeatData: '', //判断文件属性是否有重复
+    };
+  },
+  created() {
+    this.getDicts("file_type").then((response) => {
+      this.filesTypeOptions = response.data;
+    });
+  },
+  methods: {
+    // 新增附件上传
+    addRelevt() {
+      this.relevantAttachments.push({
+        fUrl: null,
+        fName: null,
+        createBy: this.createBy,
+        createTime: Date.parse(new Date()),
+      });
+    },
+    deleteRow(index, rows) {
+      if (rows[index].fId) {
+        deleteAttachment(rows[index].fId).then(res => {
+          rows.splice(index, 1);
+          this.$message.success("删除成功");
+        })
+      } else {
+        rows.splice(index, 1);
+        this.$message.success("删除成功");
+      }
+    },
+    //附件上传
+    handleSucces(scope, res, file) {
+      this.relevantAttachments[scope.$index].fName = res.fileName;
+      this.relevantAttachments[scope.$index].fUrl = res.url;
+      if (!this.relevantAttachments[scope.$index].fUrl) {
+        this.$message.error("上传失败");
+      } else {
+        this.$message.success("上传成功");
+      }
+    },
+    //附件查看
+    checkFile(scope, type) {
+      if (this.relevantAttachments[scope.$index].fUrl) {
+        if (type === 0) {
+          if (scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.jpg' || scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.png' || scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.JPG' || scope.row.fName.substring(scope.row.fName.lastIndexOf(".")) === '.PNG') {
+            this.innerVisible = true
+            this.url = this.relevantAttachments[scope.$index].fUrl
+          } else {
+            window.open(this.relevantAttachments[scope.$index].fUrl);
+          }
+        } else if (type === 1) {
+          window.open(this.relevantAttachments[scope.$index].fUrl);
+        }
+      } else {
+        this.$message.error("请上传附件");
+      }
+    },
+    // 文件属性上传判断
+    filesTypeChange(row) {
+      if (row.fType == 1) {
+        let repeat = false
+        for (let k = 0; k < this.relevantAttachments.length - 1; k++) {
+          if (row.fType == this.relevantAttachments[k].fType) repeat = true
+        }
+        if (repeat) {
+          row.fType = null
+          this.$message.warning('已存在电子签章')
+        }
+      }
+    },
+  },
+  watch: {
+    relevantAttachments(val) {
+      this.relevantAttachments = val;
+    },
+    createBy(val) {
+      this.createBy = val
+    },
+    browseStatus(val) {
+      this.browseStatus = val
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.size-change {
+  float: right;
+  margin-right: 20px;
+  cursor: pointer;
+}
+
+.size-change:hover {
+  color: #00afff;
+}
+</style>

src/views/Warehousing/inStock/index.vue

@@ -270,6 +270,10 @@
               </el-table-column>
               <el-table-column label="入库净重(kg)" prop="fNetweight" align="center" show-overflow-tooltip width="150">
               </el-table-column>
+              <el-table-column label="溢短装(kg)" prop="fActualWeight" align="center" show-overflow-tooltip width="150">
+              </el-table-column>
+              <el-table-column label="溢短装(件数)" prop="fActualNumber" align="center" show-overflow-tooltip width="150">
+              </el-table-column>
               <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip>
               </el-table-column>
             </el-table>
@@ -474,147 +478,161 @@ export default {
           width: 120,
         },
         {
-          surface: "13",
+          surface: '13',
+          label: 'fActualWeight',
+          name: '溢短装(kg)',
+          checked: 0,
+          width: 120
+        },
+        {
+          surface: '14',
+          label: 'fActualNumber',
+          name: '溢短装(件数)',
+          checked: 0,
+          width: 120
+        },
+        {
+          surface: "15",
           label: "fCntval",
           name: "箱型箱量",
           checked: 0,
           width: 120,
         },
         {
-          surface: "14",
+          surface: "16",
           label: "fApplyMoney",
           name: "开票金额",
           checked: 0,
           width: 130,
         },
         {
-          surface: "15",
+          surface: "17",
           label: "invoiceNo",
           name: "发票号",
           checked: 0,
           width: 130,
         },
         {
-          surface: "16",
+          surface: "18",
           label: "fAccbilldate",
           name: "开票时间",
           checked: 0,
           width: 130,
         },
         {
-          surface: "17",
+          surface: "19",
           label: "fTruckno",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "18",
+          surface: "20",
           label: "fDriverName",
           name: "司机名称",
           checked: 0,
           width: 100,
         },
         {
-          surface: "19",
+          surface: "21",
           label: "fDriverTel",
           name: "司机电话",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "22",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,
           width: 180,
         },
         {
-          surface: "21",
+          surface: "23",
           label: "fBusinessType",
           name: "业务类别",
           checked: 0,
           width: 100,
         },
         {
-          surface: "22",
+          surface: "24",
           label: "fFeeStatus",
           name: "费用状态",
           checked: 0,
           width: 100,
         },
         {
-          surface: "23",
+          surface: "25",
           label: "freeContainerDate",
           name: "箱使日期",
           checked: 0,
           width: 100,
         },
         {
-          surface: "24",
+          surface: "26",
           label: "fStorekeeper",
           name: "仓管员",
           checked: 0,
           width: 100,
         },
         {
-          surface: "25",
+          surface: "27",
           label: "fBillno",
           name: "系统编号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "26",
+          surface: "28",
           label: "fReceivable",
           name: "应收合计",
           checked: 0,
           width: 100,
         },
         {
-          surface: "27",
+          surface: "29",
           label: "fDue",
           name: "应付合计",
           checked: 0,
           width: 100,
         },
         {
-          surface: "28",
+          surface: "30",
           label: "",
           name: "利润",
           checked: 0,
           width: 100,
         },
         {
-          surface: "29",
+          surface: "31",
           label: "fRecycle",
           name: "实收合计",
           checked: 0,
           width: 100,
         },
         {
-          surface: "30",
+          surface: "32",
           label: "fPay",
           name: "实付合计",
           checked: 0,
           width: 100,
         },
         {
-          surface: "31",
+          surface: "33",
           label: "isPledge",
           name: "是否质押",
           checked: 0,
           width: 100,
         },
         {
-          surface: "32",
+          surface: "34",
           label: "checklists",
           name: "核注清单",
           checked: 0,
           width: 100,
         },
         {
-          surface: "33",
+          surface: "35",
           label: "remark",
           name: "备注",
           checked: 0,

src/views/Warehousing/inStock/uploadExcel.vue

@@ -196,8 +196,8 @@ export default {
       },
       actionUrl:
         process.env.VUE_APP_BASE_API +
-        // "/warehouseBusiness/inStock/importInstock", // 上传的图片服务器地址
-        "/warehouseBusiness/inStock/importInstockV1", // 上传的图片服务器地址
+        "/warehouseBusiness/inStock/importInstock", // 上传的图片服务器地址
+        // "/warehouseBusiness/inStock/importInstockV1", // 上传的图片服务器地址
       uploadVisible: false,
       excelList: [],
       drag: false,

src/views/basicdata/dept/index.vue

@@ -5,8 +5,8 @@
         <el-input v-model="queryParams.fName" placeholder="请输入仓库名称" clearable size="small"
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="仓库属性" prop="fProperties">
-        <el-select v-model="queryParams.fProperties" placeholder="仓库属性" clearable size="small">
+      <el-form-item label="土地性质" prop="fProperties">
+        <el-select v-model="queryParams.fProperties" placeholder="土地性质" clearable size="small">
           <el-option v-for="dict in fPropertiesOptions" :key="dict.dictValue" :label="dict.dictLabel"
             :value="dict.dictValue" />
         </el-select>
@@ -48,8 +48,10 @@
 
     <el-table v-loading="loading" :data="deptList" row-key="fId" :default-expand-all="false" lazy
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :load="getTreeLoad" ref="table">
-      <el-table-column prop="fName" label="仓库名称" width="310"></el-table-column>
-      <el-table-column prop="fProperties" label="仓库属性" width="100" :formatter="formatFProperties"></el-table-column>
+      <el-table-column prop="fName" label="仓库名称" width="250"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="50"></el-table-column>
+      <el-table-column prop="fProperties" label="土地性质" width="100" :formatter="formatFProperties"></el-table-column>
+      <el-table-column prop="landNature" label="仓库属性" width="100" :formatter="landNature"></el-table-column>
       <el-table-column prop="fType" label="仓库类型" width="100" :formatter="formatfType"></el-table-column>
       <el-table-column prop="fGoodsType" label="货物类型" width="100" :formatter="formatfGoodsType"></el-table-column>
       <el-table-column prop="fCoverArea" label="占地面积" width="100"></el-table-column>
@@ -82,7 +84,6 @@
         </template>
       </el-table-column>
       <el-table-column prop="remark" label="备注" width="100"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="50"></el-table-column>
       <el-table-column prop="fStatus" label="状态" :formatter="statusFormat" width="50"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="170">
         <template slot-scope="scope">
@@ -111,11 +112,11 @@
           :show-overflow-tooltip="true" />
         <el-table-column label="监控项目" :width="200" prop="projectId" header-align="center" align="center"
           :show-overflow-tooltip="true">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>
               {{ scope.row.projectId | projectIdFormat(projectIdOptions) }}
             </span>
-          </template>
+          </template> -->
 
         </el-table-column>
         <el-table-column label="设备序列号" :width="200" prop="deviceName" header-align="center" align="center"
@@ -184,7 +185,7 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item label="仓库属性" prop="fProperties" label-width="82px">
+            <el-form-item label="土地性质" prop="fProperties" label-width="82px">
               <el-select v-model="form.fProperties" multiple collapse-tags style="width:100%">
                 <el-option v-for="(item, index) in fPropertiesOptions" :key="index.dictValue" :label="item.dictLabel"
                   :value="item.dictValue" />
@@ -192,6 +193,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
+            <el-form-item label="仓库属性" prop="landNature" label-width="82px">
+              <el-select v-model="form.landNature" clearable style="width:100%">
+                <el-option v-for="(item, index) in landNatureOptions" :key="index.dictValue" :label="item.dictLabel"
+                  :value="item.dictValue" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
             <el-form-item label="仓库类型" prop="fType" label-width="82px">
               <el-select v-model="form.fType" multiple ollapse-tags style="width:100%">
                 <el-option v-for="(item, index) in fTypeOptions" :key="index.dictValue" :label="item.dictLabel"
@@ -297,7 +306,6 @@
         </el-form-item>
       </el-form>
       <!-- <up-load :relevantAttachments="relevantAttachments" :createBy="username"></up-load> -->
-
       <div style="margin-top: 20px;border: 1px solid #cccccc;padding: 5px;border-radius: 10px">
         <el-upload :headers="headers" :action="uploadImgUrl" :on-success="onSuccess" list-type="picture-card"
           :file-list="fileList" accept=".jpeg,.jpg,.png,.svg,.webp" :limit="100" :on-preview="handlePictureCardPreview"
@@ -308,7 +316,40 @@
           <img width="100%" :src="dialogImageUrl" alt="">
         </el-dialog>
       </div>
+      <div style="margin-top: 10px;">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRow2(ctnpriceItemsList)">添加</el-button>
+          </el-col>
+        </el-row>
+      </div>
+      <el-table v-loading="loading" :data="ctnpriceItemsList">
+        <el-table-column label="编号" align="center" prop="sort">
+        </el-table-column>
+        <el-table-column label="联系人" align="center" prop="contacts">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.contacts" placeholder="联系人" />
+          </template>
+        </el-table-column>
+        <el-table-column label="电话" align="center" prop="tel">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.tel" placeholder="电话" />
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark">
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.remark" placeholder="备注" />
+          </template>
+        </el-table-column>
 
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="text" icon="el-icon-delete"
+              @click.native.prevent="deleteRow(scope.$index, ctnpriceItemsList)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <upload-Contract :relevantAttachments="relevantAttachments" :createBy="username"></upload-Contract>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -318,11 +359,12 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, lazyListDept } from "@/api/basicdata/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild, lazyListDept, monitorUrl } from "@/api/basicdata/dept";
 import { list } from "@/api/monitor/monitorList";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import uploadContract from "@/views/Warehousing/components/upLoadContract";
 import Vue from 'vue'
 import upLoad from "@/views/Warehousing/components/upLoad";
 import Cookies from "js-cookie";
@@ -386,9 +428,12 @@ export default {
   components: {
     Treeselect,
     upLoad,
+    uploadContract
   },
   data() {
     return {
+      ctnpriceItemsList: [],
+      relevantAttachments: [],
       headers: {
         Authorization: "Bearer " + getToken(),
       },
@@ -398,7 +443,7 @@ export default {
       list: [],
       dialogImageUrl: '',
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
-      //仓库属性
+      //土地性质
       fPropertiesOptions: [],
       //仓库类型
       fTypeOptions: [],
@@ -471,11 +516,13 @@ export default {
       relevantAttachments: [],
       username: null,
       projectIdOptions: [],
+      landNatureOptions: [],
+      accessToken: null,
     };
   },
   watch: {
     // 'form.fProperties'(newValue) {
-    //   // 当仓库属性值发生变化时触发
+    //   // 当土地性质值发生变化时触发
     //   // 将多选的属性值转换为逗号分隔的字符串
     // },
     // 'form.fType'(newValue){
@@ -490,10 +537,13 @@ export default {
     this.getDicts("monitor_project").then((response) => {
       this.projectIdOptions = response.data;
     });
-    //仓库属性
+    //土地性质
     this.getDicts("warehouse_properties").then((response) => {
       this.fPropertiesOptions = response.data;
     });
+    this.getDicts("warehouse_landNature").then((response) => {
+      this.landNatureOptions = response.data;
+    });
     //仓库类型
     this.getDicts("warehouse_type").then((response) => {
       this.fTypeOptions = response.data;
@@ -516,20 +566,31 @@ export default {
     }
   },
   methods: {
+    deleteRow(index, rows) {
+      rows.splice(index, 1);
+    },
+    addRow2(list) {
+      let obj = {
+        sort: list.length + 1,
+        type: 'CK'
+      }
+      list.push(obj);
+    },
     handleView(row) {
       this.dialogVideoList = true;
       this.loading = true;
       let data = {
         fWarehouseId: row.parentId,
-        libraryPositionId: row.fId
+        // libraryPositionId: row.parentId
       }
       list(data).then(response => {
+        console.log(response.rows)
         this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    //仓库属性回显
+    //土地性质回显
     formatFProperties(row, index) {
       // console.log(this.fPropertiesOptions[index]);
       let name = ""
@@ -579,26 +640,16 @@ export default {
       this.pictureEist = fileList
     },
     rowView(row) {
-      Axios.post("/prod-api/api/LiveBroadcast/getAccessToken").then(res => {
-        Axios.post(`/prod-api/api/LiveBroadcast/getToken?productCode=1640070936703286&token=${res.data.data.access_token}`).then(res2 => {
-          console.log(res2)
-          Axios({
-            method: 'POST',
-            url: '/prod-api/api/LiveBroadcast/videoWeb',
-            params: {
-              deviceSerial: row.deviceSerial,
-              projectId: row.projectId,
-              channelNo: row.code,
-              token: res.data.data.access_token,
-              Authorization: res2.data.data.data.Authorization
-            }
-          })
-            .then(response => {
-              this.dialogVideo = true
-              this.iframeSrc = response.data.data.data.previewUrl
-              this.start()
-            });
-        })
+
+      const data = {
+        deviceSerial: row.deviceSerial,
+        projectId: row.projectId,
+      };
+      monitorUrl(data).then(res => {
+        this.dialogVideo = true
+        console.log(res)
+        this.iframeSrc = res.msg
+        this.start()
       })
     },
     videoClose() {
@@ -706,6 +757,8 @@ export default {
         this.form = response.data;
         this.form.fLocation = this.form.fLocation + ''
         this.form.fCharg = this.form.fCharg + ''
+        this.relevantAttachments = response.data["attach"] ? response.data["attach"] : [];
+        this.ctnpriceItemsList = response.data["ctnpriceItemsList"] ? response.data["ctnpriceItemsList"] : [];
         // this.relevantAttachments = this.form.annexList ? this.form.annexList : [];
         if (this.form.fProperties != null) {
           this.form.fProperties = this.form.fProperties.split(",");
@@ -769,7 +822,12 @@ export default {
               }
             }
             this.form.fPhotoUrl = JSON.stringify(this.form.fPhotoUrl)
-            updateDept(this.form).then(response => {
+            let obj = {
+              ...this.form,
+              attach: this.relevantAttachments,
+              ctnpriceItemsList: this.ctnpriceItemsList
+            }
+            updateDept(obj).then(response => {
               this.msgSuccess("修改成功");
               this.open = false;
               this.getList();
@@ -800,7 +858,12 @@ export default {
               }
             }
             console.log(this.form.fProperties, this.form.fType, this.form.fGoodsType);
-            addDept(this.form).then(response => {
+            let obj = {
+              ...this.form,
+              attach: this.relevantAttachments,
+              ctnpriceItemsList: this.ctnpriceItemsList
+            }
+            addDept(obj).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
               this.getList();

src/views/reportManagement/Statistics/index.vue

@@ -625,7 +625,7 @@ export default {
           label: "fBilltype",
           name: "出入库类型",
           checked: 0,
-          width: 100,
+          width: 120,
         },
         {
           surface: "5",
@@ -684,21 +684,35 @@ export default {
           width: 100,
         },
         {
-          surface: "9",
+          surface: '10',
+          label: 'fActualWeight',
+          name: '溢短装(kg)',
+          checked: 0,
+          width: 120
+        },
+        {
+          surface: '11',
+          label: 'fActualNumber',
+          name: '溢短装(件数)',
+          checked: 0,
+          width: 120
+        },
+        {
+          surface: "12",
           label: "fDrivername",
           name: "司机",
           checked: 0,
           width: 100,
         },
         {
-          surface: "9",
+          surface: "13",
           label: "fTruckno",
           name: "车号",
           checked: 0,
           width: 100,
         },
         {
-          surface: "9",
+          surface: "14",
           label: "fDriverIdCar",
           name: "司机身份证",
           checked: 0,