11

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -257,11 +257,18 @@
                                     </template>
                                 </el-table-column>
                                 <el-table-column
-                                    prop="checkType"
                                     label="质检类型"
                                     width="180">
                                     <template slot-scope="scope">
-                                        <el-input v-model="scope.row.checkType" placeholder="请输入"></el-input>
+                                        <el-select v-model="scope.row.checkType" placeholder="请选择">
+                                            <el-option
+                                            v-for="item in checkTypeOptions"
+                                            :key="item.value"
+                                            :label="item.label"
+                                            :value="item.value">
+                                            </el-option>
+                                        </el-select>
+                                       
                                     </template>
                                 </el-table-column>
                                  <el-table-column label="操作" width="100"  fixed="right" >
@@ -339,7 +346,7 @@
                 </div>
                 
             <div slot="footer" class="dialog-footer;">
-                <el-button @click.native="deletePro(1, addForm)" v-if="addForm.id" style="float:left">{{ $t('btn.delete') }}</el-button>
+                <!-- <el-button @click.native="deletePro(1, addForm)" v-if="addForm.id" style="float:left">{{ $t('btn.delete') }}</el-button> -->
                 <el-button @click.native="prodEditActive = 0;addFormVisible = false ">{{ $t('btn.cancel') }}</el-button>
                 <el-button v-if="prodEditActive == 0" type="primary" @click="submitInsert(0)" :loading="addLoading">保存</el-button>
                 <el-button v-if="prodEditActive == 0" type="primary" @click="submitInsert(1)" :loading="addLoading">保存并编辑工序</el-button>
@@ -378,15 +385,14 @@
         <el-dialog
             title="分类管理"
             :visible.sync="isganttshow"
-            width="60%"
+            width="40%"
             :before-close="handleClose">
             <div>
                 <el-table
                 :data="categoryList"
                 style="width: 100%">
-                    <el-table-column
-                        prop="date"
-                        label="日期"
+                     <el-table-column
+                        type="index"
                         width="180">
                     </el-table-column>         
                     <el-table-column
@@ -398,7 +404,7 @@
                         label="操作">
                         <template slot-scope="scope">
                             <el-button size="mini" @click="updateCategory(scope.row)">编辑</el-button>
-                            <el-button size="mini" @click="deleteCategory(scope.row.id)">删除</el-button>
+                            <el-button size="mini" @click="deleteCategory(scope.row)">删除</el-button>
                          </template>
                     </el-table-column>
                 </el-table>
@@ -639,7 +645,18 @@ a {
                 prodMaterialVersions: [],  //产品的物料版本集合
                 procedureLit: [],//当前版本的工序集合
                 prodMaterialList: [],  //当前版本的物料集合
-
+                checkTypeOptions: [
+                    {
+                       value: 0,
+                        label: '自检'
+                    }, {
+                        value: 1,
+                        label: '互检'
+                    }, {
+                        value: 2,
+                        label: '专检'
+                    }
+                ],
                 
                 prodEditActive: 0,
                 productId: null,
@@ -908,7 +925,7 @@ a {
                 this.category=row
             },
             deleteCategory(row){
-                this.http.post("/prod-category/delete",{id: row.id},
+                this.http.post("/prod-category/delete",{ id: row.id},
                 res=>{
                     console.log("=======",res.code)
                     if(res.code==='ok'){
@@ -934,6 +951,7 @@ a {
                     if(res.code=='ok'){
                         this.isganttshowCa = false
                         this.getCategoryList()
+                        this.category={}
                     }
                    
 
@@ -1003,12 +1021,14 @@ a {
                         this.procedureVersion = res.data[res.data.length - 1]
                         this.getProdProcedureVersion(row.id, index)
                         
+                        
                     })
                 this.http.post("/prod-material/getVersions", { productId: row.id },
                     res => {
                         this.list[index].tableProdMaterial.versions = res.data
                         this.prodMaterialVersion = res.data[res.data.length - 1]
                         this.getProdMaterialVersion(row.id, index)
+                      
                     })
             }
         },
@@ -1016,8 +1036,9 @@ a {
                 if(this.procedureVersion!=null&&this.procedureVersion!=''){
                     this.http.post("/prod-procedure/getInfo", { version: this.procedureVersion, productId: id },
                     res => {
-                        this.list[index].tableProdProcedure.procedureList = res.data;
-                        console.log(this.list[index].tableProdProcedure.procedureList)
+                        // this.list[index].tableProdProcedure.procedureList = res.data;
+                        // this.$forceUpdate();
+                        this.$set(this.list[index].tableProdProcedure, 'procedureList', res.data );
                     })
                 }
                 
@@ -1026,7 +1047,9 @@ a {
                 if(this.prodMaterialVersion!=null&& this.prodMaterialVersion!=''){
                     this.http.post("/prod-material/getInfo", { version: this.prodMaterialVersion, productId: id },
                     res => {
-                        this.list[index].tableProdMaterial.materialList = res.data;
+                       /*  this.list[index].tableProdMaterial.materialList = res.data;
+                        this.$forceUpdate(); */
+                        this.$set(this.list[index].tableProdMaterial, 'materialList', res.data);
                     })
                 }
                 
@@ -1135,6 +1158,7 @@ a {
                         });
                        
                         this.addFormVisible = false;
+                        this.prodEditActive  = 0
                     } else {
                         this.$message({
                             message: res.msg,