Browse Source

修改未轧规格

liyg 3 years ago
parent
commit
346b933fc0

+ 1 - 1
build/utils.js

@@ -21,7 +21,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "WMS", "inward"];
 // let devModules = ["index", "inward", "WMS", "queue"];
 // let devModules = ["index", "appoint", "statisticalReport"];
-let devModules = ["all"];
+let devModules = ["index","inward","statisticalReport"];
 
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 

+ 5 - 5
src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -363,7 +363,7 @@ export default {
               "&i" +
               new Date() +
               "&isPage=yes" +
-              "&orgCode=" +
+              "&userId=" +
               orgCode
           )
           .then(res => {
@@ -393,7 +393,7 @@ export default {
               capacityNo +
               "&i" +
               new Date() +
-              "&orgCode=" +
+              "&userId=" +
               orgCode +
               "&isPage=yes"
           )
@@ -555,7 +555,7 @@ export default {
           capacityNo +
           "&i" +
           new Date() +
-          "&orgCode=" +
+          "&userId=" +
           orgCode;
       }
       if (this.activeName == "second") {
@@ -575,7 +575,7 @@ export default {
           capacityNo +
           "&i" +
           new Date() +
-          "&orgCode=" +
+          "&userId=" +
           orgCode;
       }
       if (this.activeName == "third") {
@@ -595,7 +595,7 @@ export default {
           capacityNo +
           "&i" +
           new Date() +
-          "&orgCode=" +
+          "&userId=" +
           orgCode;
       }
     },

+ 5 - 1
src/views/queue/components/qmsEnFacotory/addModel.vue

@@ -9,7 +9,7 @@
                     <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px">新增</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">新增</el-button>
     </el-form>
   </div>
 </template>
@@ -38,6 +38,10 @@ export default {
     },
     // 新增
     makeSure() {
+        if(!this.spectionsModel || this.spectionsModel==''){
+          this.$message.warning("请输入正确的规格!");
+          return;
+        }
         let map={
             spectionsModel:this.spectionsModel
         }

+ 5 - 1
src/views/queue/components/qmsEnFacotory/editModel.vue

@@ -9,7 +9,7 @@
                     <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px">修改</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">修改</el-button>
     </el-form>
   </div>
 </template>
@@ -46,6 +46,10 @@ export default {
     },
     // 新增
     makeSure() {
+        if(!this.spectionsModel || this.spectionsModel==''){
+          this.$message.warning("请输入正确的规格!");
+          return;
+        }
         let map={
             resultId:this.resultId,
             spectionsModel:this.spectionsModel

+ 3 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelForm.vue

@@ -1,7 +1,7 @@
 //钢材统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <el-form :inline="true" style="margin-top :5px">
+    <el-form :inline="true" style="margin-top :5px;margin-left:30px">
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;"
           >计毛时间:</label
@@ -33,6 +33,8 @@
           <i class="el-icon-refresh"></i>刷新
         </el-button>
       </el-form-item>
+    </el-form>
+    <el-form :inline="true" style="margin-top :5px;margin-left:10px">
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计净重:</span>
         <el-input