chencc пре 1 година
родитељ
комит
e0ac398ddc

+ 4 - 4
src/views/saleOrder/components/order-search.vue

@@ -531,10 +531,10 @@
         const measuringUnit = this.selection[0].measuringUnit;
         const factoriesId = this.selection[0].factoriesId;
 
-        if(!factoriesId){
-          this.$message.warning('工厂未选择!');
-          return;
-        }
+        // if(!factoriesId){
+        //   this.$message.warning('工厂未选择!');
+        //   return;
+        // }
 
         for (var i = 0; i < this.selection.length; i++) {
           if (productCode != this.selection[i].productCode) {

+ 2 - 2
src/views/saleOrder/index.vue

@@ -9,9 +9,9 @@
         @check="check"
       >
       </order-search>
-
+      
       <plan-statistics></plan-statistics>
-
+      
       <el-tabs v-model="activeName" type="card" @tab-click="changeTab">
         <el-tab-pane label="待排产" name="first"></el-tab-pane>
         <el-tab-pane label="未排完" name="three"></el-tab-pane>

+ 7 - 3
src/views/saleOrder/salesToProduction.vue

@@ -57,7 +57,7 @@
           </el-col>
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }" v-if="clientEnvironmentId != 4">
-            {{ form.produceRoutingId }}99999
+       
             <el-form-item label="工艺路线:" prop="produceRoutingId">
               <!--  @click.native="openVersion"   -->
 
@@ -164,7 +164,7 @@
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5 }">
             <el-form-item label="所属工厂:" prop="factoriesId">
-              <el-select v-model="form.factoriesId" style="width: 100%" >
+              <el-select v-model="form.factoriesId" style="width: 100%" @change="factoriesIdFn">
                 <el-option
                   v-for="item of factoryList"
                   :key="item.id"
@@ -802,7 +802,7 @@ export default {
 
       console.log(this.routingList);
       console.log(this.form.produceRoutingId);
-
+      this.$forceUpdate();
       this.routingList.forEach((f) => {
         if(f.id == this.form.produceRoutingId) {
           this.$set(this.form, 'produceRoutingName', f.name);
@@ -879,6 +879,10 @@ export default {
       });
     },
 
+    factoriesIdFn(){
+      this.$forceUpdate()
+    },
+
     toInt(planProductNum) {
       return planProductNum * (this.form.marginCoefficient || 1);
     },

+ 3 - 1
vue.config.js

@@ -33,8 +33,10 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.210:86/',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.158:18086',
+        // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.158:18086',
+        target: 'http://192.168.1.125:18086',
+
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''