tijiao

build/utils.js

@@ -19,7 +19,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "TMS", "appoint", "WMS", "queue"];
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
-let devModules = ["all"];
+let devModules = ["index", "inward", "WMS", "appoint", "statisticalReport"];
 
 if (pathSrc.indexOf("node_modules") > -1) {
   devModules = require("../../../cors.js").devModules;

config/index.js

@@ -65,8 +65,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    // target: "http://172.16.33.166:80",
+    target: "http://localhost:8080",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

src/views/WMS/components/steel/addSteelInbound.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="materialNumber from">
       <span class="text">件数：</span>
-      <el-input class="input" v-model="materialNumber"> </el-input>
+      <el-input class="input" v-model.lazy="materialNumber"> </el-input>
     </div>
     <div class="materialNumber from">
       <span class="text">理重(磅重)</span>
@@ -135,7 +135,9 @@ export default {
             this.materialModel +
             "&num=" +
             this.materialNumber +
-            "&status=1"
+            "&status=1" +
+            "&i=" +
+            new Date()
         )
         .then(res => {
           if (res.data.data == -1) {
@@ -187,7 +189,9 @@ export default {
           "&startTime=" +
           sjTime(this.startTime) +
           "&endTime=" +
-          sjTime(this.endTime);
+          sjTime(this.endTime) +
+          "&i=" +
+          new Date();
       }
     },
     ondrawer(num) {
@@ -204,7 +208,9 @@ export default {
           "&startTime=" +
           sjTime(this.startTime) +
           "&endTime=" +
-          sjTime(this.endTime);
+          sjTime(this.endTime) +
+          "&i=" +
+          new Date();
       }
     },
     // 返回

src/views/WMS/components/steel/bar1_steel/bar1_addSteelInbound.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="materialNumber from">
       <span class="text">件数：</span>
-      <el-input class="input" v-model="materialNumber"> </el-input>
+      <el-input class="input" v-model.lazy="materialNumber"> </el-input>
     </div>
     <div class="materialNumber from">
       <span class="text">理重(磅重)</span>
@@ -135,7 +135,9 @@ export default {
             this.materialModel +
             "&num=" +
             this.materialNumber +
-            "&status=1"
+            "&status=1" +
+            "&i=" +
+            new Date()
         )
         .then(res => {
           if (res.data.data == -1) {
@@ -186,7 +188,9 @@ export default {
           "&startTime=" +
           sjTime(this.startTime) +
           "&endTime=" +
-          sjTime(this.endTime);
+          sjTime(this.endTime) +
+          "&i=" +
+          new Date();
       }
     },
     ondrawer(num) {
@@ -203,7 +207,9 @@ export default {
           "&startTime=" +
           sjTime(this.startTime) +
           "&endTime=" +
-          sjTime(this.endTime);
+          sjTime(this.endTime) +
+          "&i=" +
+          new Date();
       }
     },
     // 返回
@@ -270,6 +276,7 @@ export default {
               message: "入库的数量不正确",
               type: "faile"
             });
+            this.disabled = false;
           }
           this.$router.go(-1);
         });

src/views/WMS/components/steel/bar2_steel/bar2_addSteelInbound.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="materialNumber from">
       <span class="text">件数：</span>
-      <el-input class="input" v-model="materialNumber"> </el-input>
+      <el-input class="input" v-model.lazy="materialNumber"> </el-input>
     </div>
     <div class="materialNumber from">
       <span class="text">理重(磅重)</span>
@@ -186,7 +186,9 @@ export default {
           "&startTime=" +
           sjTime(this.startTime) +
           "&endTime=" +
-          sjTime(this.endTime);
+          sjTime(this.endTime) +
+          "&i=" +
+          new Date();
       }
     },
     ondrawer(num) {
@@ -203,7 +205,9 @@ export default {
           "&startTime=" +
           sjTime(this.startTime) +
           "&endTime=" +
-          sjTime(this.endTime);
+          sjTime(this.endTime) +
+          "&i=" +
+          new Date();
       }
     },
     // 返回
@@ -270,6 +274,7 @@ export default {
               message: "入库的数量不正确",
               type: "faile"
             });
+            this.disabled = false;
           }
           this.$router.go(-1);
         });

src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -226,25 +226,6 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div>
-      <el-dialog
-        title="销售订单预览"
-        :visible.sync="dialogTableVisible"
-        :center="true"
-        width="100%"
-      >
-        <ExcelSaleOrder :tableData="tableData"></ExcelSaleOrder>
-        <div class="btn">
-          <el-button
-            type="primary"
-            @click="addExcelInport"
-            @keyup.native.enter="addExcelInport"
-            >确认</el-button
-          >
-          <el-button type="primary" @click="cancelExcelInport">取消</el-button>
-        </div>
-      </el-dialog>
-    </div>
   </div>
 </template>
 <script>
@@ -350,7 +331,8 @@ export default {
         "isSelfMention",
         "saleRemark",
         "saleOrderReceiveCustomer",
-        "salerName"
+        "salerName",
+        "saleOrderNo"
       ],
       saleOrderMapList: [
         "truckNo",
@@ -444,18 +426,7 @@ export default {
     } else {
       this.saleDateOfReceipt = loadTime1;
     }
-    // document.addEventListener("keydown", e => {
-    //   let key = window.event.keyCode;
-    //   if (key == 13) {
-    //     // 13是enter键的键盘码 如果等于13 就调用click的登录方法
-    //     this.addExcelInport();
-    //   }
-    // });
   },
-  // beforeDestroy() {
-  //   //这里的 this.login('loginForm') 指的是键盘事件的方法名
-  //   document.removeEventListener("keydown", this.addExcelInport());
-  // },
   activated() {
     if (getCookie("orgCode") == "shouhuokehu") {
       this.option.requestUrl =
@@ -521,13 +492,35 @@ export default {
           let map = {};
           try {
             Object.keys(e).forEach(e1 => {
+              if (e1.includes("销售订单编号")) {
+                map.saleOrderNo = e[e1];
+              }
               if (e1.includes("物资名称")) {
                 map.materialName = e[e1];
+                if (
+                  e[e1].includes("盘螺") ||
+                  e[e1].includes("乱尺") ||
+                  e[e1].includes("盘元") ||
+                  e[e1].includes("盘圆")
+                ) {
+                  map.isPoundSale = 0;
+                } else {
+                  map.isPoundSale = 1;
+                }
+                //确定更改的物资有无米数
+                if (e[e1].includes("米")) {
+                  map.steelMeters = Number(e[e1].replace(/[^0-9]/gi, ""));
+                } else {
+                  map.steelMeters = null;
+                }
               }
               if (e1.includes("下单客户")) {
                 map.receiveName = e[e1];
               }
-              if (e1.includes("米数")) {
+              if (
+                e1.includes("米数") &&
+                (map.steelMeters == null || map.steelMeters != "")
+              ) {
                 map.steelMeters = e[e1];
               }
               if (e1.includes("物资规格")) {
@@ -593,18 +586,6 @@ export default {
               if (e1.includes("备注")) {
                 map.truckRemark = e[e1];
               }
-              if (e1.includes("是否磅重交货")) {
-                if (e[e1] == "是") {
-                  map.isPoundSale = 0;
-                } else if (e[e1] == "否") {
-                  map.isPoundSale = 1;
-                } else {
-                  throw new Error(
-                    `该Excel第--${index +
-                      2}--行-“是否磅重交货”-错误,请核实后再输入`
-                  );
-                }
-              }
               if (e1.includes("是否自提")) {
                 if (e[e1] === "是" || e[e1] === "否") {
                   map.isSelfMention = e[e1];
@@ -621,64 +602,75 @@ export default {
             that.$message.error(e.message);
           }
         });
-        that.dialogTableVisible = true;
+        console.log(this.tableData);
+        that.addExcelInport();
+        // that.dialogTableVisible = true;
         return;
       };
       reader.readAsBinaryString(file.raw); //以二进制方式读取
     },
     addExcelInport() {
-      this.$confirm("以上均核对正确,确定导入Excel", "提示", {
-        cancelButtonText: "取消",
-        confirmButtonText: "确认",
-        center: true
-      })
-        .then(() => {
-          let map = {};
-          let arr = [];
-          this.tableData.forEach(e => {
-            let mapMaterial = {};
-            Object.keys(e).forEach(e1 => {
-              if (this.saleOrderList.includes(e1)) {
-                map[e1] = e[e1];
-              }
-              if (this.saleOrderMapList.includes(e1)) {
-                mapMaterial[e1] = e[e1];
-              }
-            });
-            mapMaterial.saleDateOfReceipt = sjTime(this.saleDateOfReceipt);
-            arr.push(mapMaterial);
+      //加载虚拟
+      const loading = this.$loading({
+        lock: true,
+        text: "正在快马加鞭为您生成销售订单,请稍候",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)"
+      });
+      //需要遍历数组，以销售订单编号为分类
+      const map1 = this.tableData.reduce((result, item) => {
+        result[item.saleOrderNo] = result[item.saleOrderNo] || [];
+        result[item.saleOrderNo].push(item);
+        return result;
+      }, {});
+      // result即为所求
+      let result = Object.values(map1);
+      //遍历数组
+      let saleOrderListMap = [];
+      result.forEach((saleOrderList, index) => {
+        let map = {};
+        let arr = [];
+        console.log("saleOrderList");
+        console.log(saleOrderList);
+        saleOrderList.forEach(e => {
+          let mapMaterial = {};
+          Object.keys(e).forEach(e1 => {
+            if (this.saleOrderList.includes(e1)) {
+              map[e1] = e[e1];
+            }
+            if (this.saleOrderMapList.includes(e1)) {
+              mapMaterial[e1] = e[e1];
+            }
           });
-          map.shipperId = 1;
-          map.mapList = arr;
-          console.log(map);
-          this.axios
-            .post("/api/v1/ams/addSteelSaleOrder", map)
-            .then(res => {
-              if (res.data.code == "200") {
-                this.$message.success("新增销售订单成功!");
-                this.getRequestUrl();
-                this.dialogTableVisible = false;
-                this.tableData = [];
-              } else {
-                this.$message.error(res.data.data);
-                this.getRequestUrl();
-                this.dialogTableVisible = false;
-                this.tableData = [];
-              }
-            })
-            .catch(e => {
-              this.$message.error("生成错误!");
-              this.dialogTableVisible = false;
-              this.tableData = [];
-            });
+          mapMaterial.saleDateOfReceipt = sjTime(this.saleDateOfReceipt);
+          arr.push(mapMaterial);
+        });
+        map.shipperId = 1;
+        map.mapList = arr;
+        saleOrderListMap.push(map);
+      });
+      console.log(saleOrderListMap);
+      this.axios
+        .post("/api/v1/ams/addSteelSaleOrderList", saleOrderListMap)
+        .then(res => {
+          if (res.data.code == "200") {
+            loading.close();
+            this.getRequestUrl();
+            this.$message.success("新增销售订单成功!");
+            this.tableData = [];
+          } else {
+            this.$message.error(res.data.data);
+            this.getRequestUrl();
+            loading.close();
+            this.tableData = [];
+          }
         })
-        .catch(() => {
-          this.$message.info("取消导入");
+        .catch(e => {
+          this.$message.error("生成错误!");
+          loading.close();
+          this.tableData = [];
         });
     },
-    cancelExcelInport() {
-      this.dialogTableVisible = false;
-    },
     adverseCloseSaleOrder(row) {
       console.log(row);
       this.$confirm("确定反关闭整条订单吗?", "继续?", {

src/views/inward/components/truckAppoint/addRequirement2.vue

@@ -81,40 +81,35 @@
             </el-form-item>
           </el-form>
         </div>
-        <el-drawer
-          title="选择车辆类型"
-          :visible.sync="drawer2"
-          direction="rtl"
-          size="40%"
-          :show-close="false"
-        >
-          <div style="margin-left: -300px">
+        <div class="drawSty">
+          <el-drawer
+            :visible.sync="drawer2"
+            direction="rtl"
+            size="40%"
+            :show-close="false"
+          >
             <el-input
               placeholder="请输入内容"
               v-model="inputCapacityType"
-              style="margin-left: 20px; width: 250px"
               clearable
+              style="margin-left:20px"
             >
             </el-input
             ><el-button type="primary" class="btn" @click="onclickCapacity">
               <i class="el-icon-search"></i>查询
             </el-button>
-          </div>
-
-          <!-- <el-button @click="open">取消</el-button> -->
-
-          <div class="tablecls">
-            <dilTable
-              ref="options3"
-              v-bind.sync="options3"
-              @radio-change="selectionChange1"
-              :drawer="aaadrawer"
-            >
-            </dilTable>
-          </div>
-        </el-drawer>
+            <div class="tablecls">
+              <dilTable
+                ref="options3"
+                v-bind.sync="options3"
+                @radio-change="selectionChange1"
+                :drawer="aaadrawer"
+              >
+              </dilTable>
+            </div>
+          </el-drawer>
+        </div>
       </div>
-
       <!-- 选择物资 -->
       <div class="materialDrawer">
         <el-form :inline="true" class="demo-form-inline" label-width="80px">
@@ -278,7 +273,7 @@
         <el-input
           placeholder="请输入内容"
           v-model="input"
-          style="margin-top: 5px; margin-left: 10px; width: 250px"
+          style="width: 250px"
           clearable
         >
         </el-input>
@@ -311,9 +306,7 @@
       </el-drawer>
     </div>
     <div class="button-box">
-      <el-button type="primary" @click="makeSure" 
-        >确认新增</el-button
-      >
+      <el-button type="primary" @click="makeSure">确认新增</el-button>
       <el-button type="primary" @click="cancel">返回</el-button>
     </div>
   </div>
@@ -334,44 +327,44 @@ export default {
       options6: [
         {
           value: "焦化",
-          label: "焦化",
+          label: "焦化"
         },
         {
           value: "污粉",
-          label: "污粉",
+          label: "污粉"
         },
         {
           value: "喷煤",
-          label: "喷煤",
+          label: "喷煤"
         },
         {
           value: "溶剂",
-          label: "溶剂",
+          label: "溶剂"
         },
         {
           value: "配料",
-          label: "配料",
+          label: "配料"
         },
         {
           value: "二次",
-          label: "二次",
+          label: "二次"
         },
         {
           value: "原料",
-          label: "原料",
+          label: "原料"
         },
         {
           value: "烧结矿",
-          label: "烧结矿",
+          label: "烧结矿"
         },
         {
           value: "打堆、装车",
-          label: "打堆、装车",
+          label: "打堆、装车"
         },
         {
           value: "回收废旧物资",
-          label: "回收废旧物资",
-        },
+          label: "回收废旧物资"
+        }
       ],
       installremark: "",
       options: [],
@@ -389,25 +382,25 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: "140",
+          width: "140"
         },
         {
           prop: "requirementPlatformName",
           label: "装货点",
           slot: true,
-          width: "140",
+          width: "140"
         },
         {
           prop: "truckPoint1",
           label: "卸货点",
           slot: true,
-          width: "140",
+          width: "140"
         },
         {
           prop: "orderMaterialWeight",
           label: "重量",
-          slot: true,
-        },
+          slot: true
+        }
       ],
       row: {},
       //物资表格数据
@@ -439,25 +432,25 @@ export default {
       materialTable: {
         requestUrl: "",
         selectionType: "select",
-        mapList1: [],
+        mapList1: []
       },
       second1: {
         requestUrl: "",
         selectionType: "radio",
-        mapList2: [],
+        mapList2: []
       },
       options3: {
         requestUrl: "",
         selectionType: "radio",
-        mapList3: [],
+        mapList3: []
       },
-      form: {},
+      form: {}
     };
   },
   computed: {
     requirementType() {
       return this.form.requirementType;
-    },
+    }
   },
   watch: {
     requirementType() {
@@ -484,14 +477,14 @@ export default {
         this.tableTop.push({
           prop: "orderMaterialNumber",
           label: "件数",
-          slot: true,
+          slot: true
         });
       } else {
         this.tableTop.splice(this.tableTop.length - 1, 1);
         this.tableTop.push({
           prop: "orderMaterialWeight",
           label: "重量",
-          slot: true,
+          slot: true
         });
       }
     },
@@ -501,7 +494,7 @@ export default {
       } else {
         this.aaadrawer = true;
       }
-    },
+    }
   },
   methods: {
     //用车单位弹出层
@@ -517,7 +510,7 @@ export default {
     querySearchCarrier(queryString, cb) {
       this.axios
         .post("/api/v1/uc/getRequireUnitName?index=" + queryString)
-        .then((res) => {
+        .then(res => {
           if (res.data.code == "200") {
             var restaurantsCarrier = res.data.data;
             // console.log(restaurantsCarrier,"restaurantsCarrier");
@@ -530,7 +523,7 @@ export default {
         });
     },
     createFilterCarrier(queryString) {
-      return (restaurantsCarrier) => {
+      return restaurantsCarrier => {
         return (
           restaurantsCarrier.shipperName
             .toLowerCase()
@@ -580,16 +573,23 @@ export default {
     },
     handleClose2(done) {
       console.log(this.tableData.length);
-      console.log("this.form.requirementType:",this.form.requirementType);
-      if (this.tableData.length > 0 && this.selectionList1.length > 0 && this.form.requirementType!='倒库') {
+      console.log("this.form.requirementType:", this.form.requirementType);
+      if (
+        this.tableData.length > 0 &&
+        this.selectionList1.length > 0 &&
+        this.form.requirementType != "倒库"
+      ) {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      if (this.selectionList1.length > 1 && this.form.requirementType!='倒库') {
+      if (
+        this.selectionList1.length > 1 &&
+        this.form.requirementType != "倒库"
+      ) {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      this.selectionList1.forEach((e) => {
+      this.selectionList1.forEach(e => {
         // console.log(e.materialModel,e.materialSpecification)
         if (e.materialSpecification == null) {
           e.materialSpecification = "";
@@ -600,7 +600,7 @@ export default {
         var addmap = {
           materialName:
             e.materialName + e.materialSpecification + e.materialModel,
-          materialId: e.materialId,
+          materialId: e.materialId
         };
         this.tableData.push(addmap);
       });
@@ -611,7 +611,7 @@ export default {
     refreshTable() {
       var arr = this.tableData;
       this.tableData = [];
-      arr.forEach((e) => {
+      arr.forEach(e => {
         var addmap = {
           materialName: e.materialName,
           materialId: e.materialId,
@@ -622,7 +622,7 @@ export default {
           orderMaterialNumber: e.orderMaterialNumber,
           orderMaterialWeight: e.orderMaterialWeight,
           loadPointName: e.loadPointName,
-          unloadPointName: e.unloadPointName,
+          unloadPointName: e.unloadPointName
         };
         this.tableData.push(addmap);
       });
@@ -645,7 +645,6 @@ export default {
             "&index=" +
             this.inputMaterial;
         }
-        this.inputMaterial = null;
       }
     },
     onclickCapacity() {
@@ -655,7 +654,6 @@ export default {
         this.options3.requestUrl =
           "/api/v1/uc/getCapacityType?apiId=460&index=" +
           this.inputCapacityType;
-        this.inputCapacityType = null;
       }
     },
     //删除行
@@ -667,15 +665,22 @@ export default {
     // 返回主界面
     makeSure1() {
       console.log(this.tableData.length);
-      if (this.tableData.length > 0 && this.selectionList1.length > 0 && this.form.requirementType!="倒库") {
+      if (
+        this.tableData.length > 0 &&
+        this.selectionList1.length > 0 &&
+        this.form.requirementType != "倒库"
+      ) {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      if (this.selectionList1.length > 1 && this.form.requirementType!="倒库") {
+      if (
+        this.selectionList1.length > 1 &&
+        this.form.requirementType != "倒库"
+      ) {
         this.$message.warning("一个需求只允许填写一个物资");
         return;
       }
-      this.selectionList1.forEach((e) => {
+      this.selectionList1.forEach(e => {
         // console.log(e.materialModel,e.materialSpecification)
         if (e.materialSpecification == null) {
           e.materialSpecification = "";
@@ -686,7 +691,7 @@ export default {
         var addmap = {
           materialName:
             e.materialName + e.materialSpecification + e.materialModel,
-          materialId: e.materialId,
+          materialId: e.materialId
         };
         this.tableData.push(addmap);
       });
@@ -696,7 +701,7 @@ export default {
     refreshTable() {
       var arr = this.tableData;
       this.tableData = [];
-      arr.forEach((e) => {
+      arr.forEach(e => {
         var addmap = {
           materialName: e.materialName,
           materialId: e.materialId,
@@ -707,7 +712,7 @@ export default {
           orderMaterialNumber: e.orderMaterialNumber,
           orderMaterialWeight: e.orderMaterialWeight,
           loadPointName: e.loadPointName,
-          unloadPointName: e.unloadPointName,
+          unloadPointName: e.unloadPointName
         };
         this.tableData.push(addmap);
       });
@@ -797,7 +802,7 @@ export default {
       // console.log("进来了");
       // console.log(this.whether);
       // console.log(this.installremark);
-      if (this.tableData.length > 1 && this.form.requirementType!='倒库') {
+      if (this.tableData.length > 1 && this.form.requirementType != "倒库") {
         this.$message.warning("非倒库需求只允许填写一个物资");
         return;
       }
@@ -846,7 +851,7 @@ export default {
         return;
       }
       var i = 0;
-      this.tableData.forEach((e) => {
+      this.tableData.forEach(e => {
         if (e.requirementPlatformId && e.requirementUnloadUnitId) {
           i++;
         }
@@ -858,7 +863,7 @@ export default {
       }
       // console.log(this.tableData)
       var DueTime;
-      if (this.DueTime == null) {
+      if (this.DueTime == null && this.isOpenDueTime == true) {
         this.$message.warning("截止日期必填");
         this.disabled = false;
         return;
@@ -901,15 +906,15 @@ export default {
         capacityTypeId: this.capacityTypeId,
         mapList: this.tableData,
         orgCode: getCookie("orgCode"),
-        remark: this.form.Tel + this.capacityTypeName + this.form.typeRemarks,
+        remark: this.form.Tel + this.capacityTypeName + this.form.typeRemarks
       };
       this.axios
         .post("/api/v1/ams/addTruckRequirement", requiremnet)
-        .then((res) => {
+        .then(res => {
           if (res.data.code == 200) {
             this.$message({
               type: "success",
-              message: "新增成功!",
+              message: "新增成功!"
             });
             this.$router.go(-1);
           } else {
@@ -925,8 +930,8 @@ export default {
     // 返回
     cancel() {
       this.$router.go(-1);
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -1054,3 +1059,11 @@ export default {
   }
 }
 </style>
+<style>
+.el-drawer__body {
+  overflow: auto;
+}
+.el-drawer__container ::-webkit-scrollbar {
+  display: none;
+}
+</style>

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelAllReport.vue

@@ -102,8 +102,9 @@
         <el-table-column
           prop="consigneeName"
           label="下单客户"
-          :width="flexColumnWidth('consigneeName', tableData, 'max')"
+          width="160px"
           align="center"
+          show-overflow-tooltip
           fixed
         >
         </el-table-column>
@@ -111,12 +112,12 @@
           prop="carrierName"
           label="承运商"
           align="center"
-          width="250px"
+          width="120px"
           fixed
         >
           <template slot-scope="scope">
             <el-autocomplete
-              style="width:120px"
+              style="width:100px"
               v-model="scope.row.carrierName"
               :fetch-suggestions="querySearchCarrier"
               placeholder="请输入承运商"
@@ -137,7 +138,7 @@
           column-key="capacityNo"
           label="车牌号"
           align="center"
-          width="250px"
+          width="150px"
           fixed
         >
           <template slot-scope="scope">
@@ -296,6 +297,8 @@
           width="100px"
         >
         </el-table-column>
+        <el-table-column prop="closeEntryId" label="金蝶分录ID" width="100px">
+        </el-table-column>
         <el-table-column
           label="操作"
           fixed="right"
@@ -310,14 +313,16 @@
               v-if="scope.row.deletedStatus == null"
               >关闭分录</el-button
             >
+            <el-button
+              type="text"
+              size="small"
+              @click="adverseCloseSaleMaterial(scope.row)"
+              v-if="scope.row.deletedStatus != null"
+              >反关闭分录</el-button
+            >
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
+        <el-table-column label="操作" fixed="right" width="80px" align="center">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -332,22 +337,6 @@
             >
           </template>
         </el-table-column>
-        <el-table-column
-          label="操作"
-          fixed="right"
-          width="120px"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              size="small"
-              @click="adverseCloseSaleMaterial(scope.row)"
-              v-if="scope.row.deletedStatus != null"
-              >反关闭分录</el-button
-            >
-          </template>
-        </el-table-column>
       </el-table>
     </div>
     <div class="address">