提交代码

build/utils.js

@@ -19,8 +19,8 @@ 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 = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS"];
+//let devModules = ["all"];
+let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'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/appoint/components/saleContract/addSaleOrder.vue

@@ -110,19 +110,6 @@
         </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >可装货时间</label
-        >
-        <el-date-picker
-          class="textinput3"
-          v-model.number="saleDateOfReceipt"
-          type="datetime"
-          placeholder="选择日期时间"
-          disabled
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <label
           class="el-form-item__label"
@@ -151,6 +138,19 @@
           placeholder="(非必填)"
         ></el-input>
       </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;"
+        >可装货时间</label
+        >
+        <el-date-picker
+          class="textinput3"
+          v-model.number="saleDateOfReceipt"
+          type="datetime"
+          placeholder="选择日期时间"
+          disabled
+        >
+        </el-date-picker>
+      </el-form-item>
     </el-form>
 
     <div class="button-box">

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

@@ -109,19 +109,6 @@
         </el-autocomplete>
         <el-button type="primary" @click="ondrawerOut">选择</el-button>
       </el-form-item>
-      <el-form-item>
-        <label class="el-form-item__label" style="width: auto;"
-          >可装货时间</label
-        >
-        <el-date-picker
-          class="textinput3"
-          v-model.number="saleDateOfReceipt"
-          type="datetime"
-          placeholder="选择日期时间"
-          disabled
-        >
-        </el-date-picker>
-      </el-form-item>
       <el-form-item>
         <label
           class="el-form-item__label"
@@ -150,6 +137,19 @@
           placeholder="(非必填)"
         ></el-input>
       </el-form-item>
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;"
+        >可装货时间</label
+        >
+        <el-date-picker
+          class="textinput3"
+          v-model.number="saleDateOfReceipt"
+          type="datetime"
+          placeholder="选择日期时间"
+          disabled
+        >
+        </el-date-picker>
+      </el-form-item>
     </el-form>
 
     <div class="button-box">

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

@@ -262,13 +262,13 @@ export default {
         requestUrl: "",
         selectionType: "select",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 4, 9, 10, 11, 12, 13, 14, 15, 16, 17]
+        columnIndexs: [0,1,2,7,8,9, 10, 11, 12, 13, 14, 15, 16, 17]
       },
       option2: {
         // 表格请求数据的地址
         requestUrl: "",
         comparison: "saleNumber",
-        columnIndexs: [0, 1, 2, 3, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+        columnIndexs: [0,1,6,7,8, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option4: {
         // 表格请求数据的地址
@@ -277,8 +277,8 @@ export default {
         columnIndexs: [
           0,
           1,
-          2,
-          3,
+          6,
+          7,
           8,
           9,
           10,
@@ -301,9 +301,7 @@ export default {
         comparison: "saleNumber",
         columnIndexs: [
           0,
-          1,
-          2,
-          3,
+          6,
           7,
           8,
           9,

src/views/sale/components/dilNotice/addNotice1.vue

@@ -0,0 +1,70 @@
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="389" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>

src/views/sale/components/dilNotice/addNotice2.vue

@@ -0,0 +1,71 @@
+<template>
+  <!-- 添加公告信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="390" v-model="form1" ref="from1"></dil-form>
+    </div>
+
+    <div class="button-box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+      value: undefined,
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      let DilNotice = {
+        noticeTitle:this.form1.noticeTitle,
+        insertUsername:this.form1.insertUsername,
+        noticeContent:this.form1.noticeContent,
+        permissions:this.form1.permission,
+        /*这里permissions拿的是描述也就是name值*/
+      }
+      this.axios
+        .post(
+          "/api/v1/ams/insertNotice",DilNotice
+        )
+        .then((res) => {
+          this.$router.go(-1);
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+.from {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-top: 5px;
+  margin-bottom: 20px;
+}
+.button-box{
+  display: flex;
+  text-align: center;
+  align-items: center;
+  justify-content: center;
+  margin-top: 0.3125rem;
+  margin-bottom: 1.25rem;
+}
+</style>
+

src/views/sale/components/dilNotice/clientNotice.vue

@@ -77,7 +77,7 @@ export default {
     },
     /*新增通知*/
     toInsert() {
-      this.$router.push("/addNotice");
+      this.$router.push("/addNotice2");
 
     },
 

src/views/sale/components/dilNotice/marketingNotice.vue

@@ -78,7 +78,7 @@ export default {
     },
     /*新增通知*/
     toInsert() {
-      this.$router.push("/addNotice");
+      this.$router.push("/addNotice1");
 
     },
 

src/views/sale/router/index.js

@@ -48,6 +48,8 @@ import add_sale_dilNotice from "../components/dilNotice/add_sale_dilNotice.vue";
 import Carrier_dilNotice from "../components/dilNotice/Carrier_dilNotice.vue";
 import sale_dilNotice from "../components/dilNotice/sale_dilNotice.vue";
 import addNotice from "../components/dilNotice/addNotice.vue";
+import addNotice1 from "../components/dilNotice/addNotice1.vue";
+import addNotice2 from "../components/dilNotice/addNotice2.vue";
 import carrierNotice from "../components/dilNotice/carrierNotice.vue";
 import clientNotice from "../components/dilNotice/clientNotice.vue";
 import editNotice from "../components/dilNotice/editNotice.vue";
@@ -374,6 +376,18 @@ const constantRouterMap = [
         meta: { code: "xtpzgl-yhgl" },
         component: addNotice
       },
+      {
+        path: "addNotice1",
+        name: "addNotice1",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addNotice1
+      },
+      {
+        path: "addNotice2",
+        name: "addNotice2",
+        meta: { code: "xtpzgl-yhgl" },
+        component: addNotice2
+      },
       {
         path: "carrierNotice",
         name: "carrierNotice",

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

@@ -122,6 +122,7 @@
               placeholder="请输入承运商"
               @select="handleSelectCarrier(scope.row, scope.$index)"
               :disabled="scope.row.isCarrierShow != 1"
+              v-if="scope.row.isCarrierShow == 1"
             >
             </el-autocomplete>
             <el-button
@@ -147,6 +148,7 @@
               placeholder="请输入车牌号"
               @select="handleSelect(scope.row, scope.$index)"
               :disabled="scope.row.isCapacityShow != 1"
+              v-if="scope.row.isCarrierShow == 1"
             ></el-autocomplete>
             <el-button
               @click="updateCapacity(scope.row)"