Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -18,8 +18,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index', 'qualityControl', 'standard', 'basicconfig'];
 // let devModules = ['index','devops','workFlow','systemConfig', 'microService'];
-// let devModules = ['all'];
-let devModules = ['index','inward']
+let devModules = ['all'];
+// let devModules = ['index','inward','appoint','sale']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

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

@@ -198,7 +198,7 @@ export default {
       input: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId,
+        requestUrl: "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" + this.$route.params.saleOrderId,
         // 控制显示多选列
         selectionType: "select",
       },

src/views/inward/components/truckOrder/dispatchPlan.vue

@@ -46,7 +46,7 @@ export default {
       second: {
         // second请求数据的地址
         requestUrl:
-          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=40&carrierId=1",
+          "/api/v1/oms/getInwardOrderList?apiId=260&orderStatus=4&carrierId=40",
       },
       activeName: "first",
     };

src/views/sale/components/transport_appointment/directionalDispatch.vue

@@ -174,6 +174,10 @@ export default {
       this.axios.post("api/v1/ams/addDispatchSaleOrder", map).then((res) => {
           if (res.data.code == "200") {
             this.$router.go(0);
+            this.$message({
+            type: "success",
+            message: "下发成功!",
+          });
           }
         });
       }

src/views/sale/components/transport_appointment/openDistribution.vue

@@ -48,6 +48,18 @@
 				</div>
 			</el-drawer> -->
 		</el-tab-pane>
+    <!-- 已派单 -->
+    <el-tab-pane label="已派单" name="three">
+				<dilTable v-bind.sync="three">
+          <!-- <el-table-column fixed="right" label="操作" width="50">
+            <template slot-scope="scope">
+          <el-button @click="dispatch(scope)  " type="text" size="small">
+            派单
+          </el-button>
+            </template>
+      </el-table-column> -->
+      </dilTable>
+		</el-tab-pane>
     </el-tabs>
     
     </div>

src/views/sale/components/transport_appointment/openDistributionSection.vue

@@ -128,6 +128,10 @@ export default {
       this.axios.post("api/v1/oms/addSaleTruckOrder", map).then((res) => {
           if (res.data.code == "200") {
             this.$router.go(-1);
+            this.$message({
+            type: "success",
+            message: "派单成功!",
+          });
           }
         });
     },