dev

build/utils.js

@@ -24,7 +24,6 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "appoint", "statisticalReport", "WMS","TMS"];
 let devModules = ["all"];
 
-
 // let devModules = ["index", "appoint", "statisticalReport", "WMS"];
 // let devModules = ["all"];
 

config/index.js

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

src/components/DilCommonUI/packages/table/src/table.vue

@@ -225,7 +225,7 @@ export default {
     // 每页显示个数选择器的选项设置
     pageSizes: {
       default() {
-        return [5,10, 20, 50, 100, 200, 1000, 50000];
+        return [5, 10, 20, 50, 100, 200, 1000, 50000];
       }
     },
     // 每页显示条目个数，支持 .sync 修饰符

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

@@ -153,6 +153,8 @@
         </el-table-column>
         <el-table-column property="materialSpecification" label="规格">
         </el-table-column>
+        <el-table-column property="meterNumber" label="物资件数">
+        </el-table-column>
         <el-table-column property="materialModel" label="型号">
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="200">
@@ -1190,7 +1192,7 @@ export default {
           this.pos1 = 0;
         } else {
           // 判断当前元素与上一个元素是否相同
-          if (data[i].capacityNumber === data[i - 1].capacityNumber) {
+          if (data[i].saleOrderMaterialId === data[i - 1].saleOrderMaterialId) {
             this.spanArr1[this.pos1] += 1;
             this.spanArr1.push(0);
           } else {

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

@@ -664,9 +664,12 @@ export default {
       width: 170px;
       text-align: right;
     }
-    .input {
-      width: 250px;
-      margin-right: 90px;
+
+    .el-select ::v-deep {
+      .el-input__inner {
+        margin-right: -30px;
+        width: 250px;
+      }
     }
   }
   .carrier {

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -313,7 +313,7 @@ export default {
       this.start();
     },
     getSteelOrderNum() {
-      this.axios.post("/api/v1/uc/getSteelOrderNum").then(res => {
+      this.axios.get("/api/v1/uc/getSteelOrderNum").then(res => {
         this.steelOrderNum = res.data.data;
       });
     },