liyg před 2 roky
rodič
revize
76d4d6afb3

+ 4 - 4
src/views/queue/components/qmsEnFacotory/addModel.vue

@@ -3,13 +3,13 @@
   <div style="width:100%">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+    <el-form style="width:500px;margin-left:35%;margin-top:50px">
         <el-form-item style="display:inline" label="未轧规格">
-            <el-select filterable  v-model="spectionsModel">
-                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            <el-select filterable  v-model="spectionsModel" style="width:300px">
+                    <el-option v-for="item in models" :value="item.materialId" :key="item.materialId" :label="item.materialName"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">新增</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:100px">新增</el-button>
     </el-form>
   </div>
 </template>

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

@@ -3,13 +3,13 @@
   <div style="width:100%">
     <page-title>返回</page-title>
     <!-- 第一部分 -->
-    <el-form style="width:400px;margin-left:40%;margin-top:50px">
+    <el-form style="width:500px;margin-left:35%;margin-top:50px">
         <el-form-item style="display:inline" label="未轧规格">
-            <el-select filterable  v-model="spectionsModel">
-                    <el-option v-for="item in models" :value="item" :key="item" :label="item"></el-option>
+            <el-select filterable  v-model="spectionsModel" style="width:300px">
+                   <el-option v-for="item in models" :value="item.materialId" :key="item.materialId" :label="item.materialName"></el-option>
             </el-select>
         </el-form-item>
-        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:60px">修改</el-button>
+        <el-button type="primary" @click="makeSure" style="margin:20px;margin-left:100px">修改</el-button>
     </el-form>
   </div>
 </template>
@@ -35,7 +35,7 @@ export default {
         console.log("resultId:"+this.$route.params.resultId);
         console.log("spectionsModel:"+this.$route.params.spectionsModel);
         this.resultId=this.$route.params.resultId;
-        this.spectionsModel=this.$route.params.spectionsModel;
+        this.spectionsModel=parseInt(this.$route.params.spectionsModel);
     },
     getAllModel(){
       this.axios

+ 6 - 1
src/views/queue/components/qmsEnFacotory/model.vue

@@ -39,6 +39,11 @@
           :row-style="{height:'40px'}"
           style="width: 100%;font-size: 18px">
           <el-table-column
+          align="center"
+            prop="materialName"
+            label="物资名称">
+          </el-table-column>
+          <el-table-column
           align="center"
             prop="spectionsModel"
             label="未轧规格">
@@ -121,7 +126,7 @@ export default {
     },
     updateclick(row) {
       console.log(row);
-      this.$router.push("/editModel/" + row.resultId+"/"+row.spectionsModel);
+      this.$router.push("/editModel/" + row.resultId+"/"+row.materialId);
     },
     addclick() {
       this.$router.push("/addModel");