|
|
@@ -76,7 +76,7 @@
|
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item label="物料单">
|
|
|
+ <!-- <el-form-item label="物料单">
|
|
|
<span>版本号：</span>
|
|
|
<el-select v-model="prodMaterialVersion" placeholder="请选择版本号"
|
|
|
@change="changeMaterialVersion(props.row)">
|
|
|
@@ -103,7 +103,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -164,7 +164,7 @@
|
|
|
|
|
|
</el-step>
|
|
|
<el-step title="派工单"></el-step>
|
|
|
- <el-step title="物料信息"></el-step>
|
|
|
+ <!-- <el-step title="物料信息"></el-step> -->
|
|
|
</el-steps>
|
|
|
<div v-if="prodEditActive == 0" style="height: 72vh;overflow-y: auto;overflow-x: hidden;">
|
|
|
<el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
|
|
|
@@ -246,8 +246,9 @@
|
|
|
<i class="el-icon-plus" @click="addProcedure()"></i>
|
|
|
|
|
|
</div>
|
|
|
- <div v-if="prodEditActive == 2">
|
|
|
- <!--此处是录入物料的模块-->
|
|
|
+ <!--此处是录入物料的模块-->
|
|
|
+ <!-- <div v-if="prodEditActive == 2">
|
|
|
+
|
|
|
|
|
|
<el-input placeholder="请输入物料版本号" v-model="prodMaterialVersion" class="input-pM"></el-input>
|
|
|
<el-table :data="prodMaterialList" style="width: 100%">
|
|
|
@@ -293,7 +294,7 @@
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<i class="el-icon-plus" @click="addMaterial()"></i>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
|
|
|
<div slot="footer" class="dialog-footer;">
|
|
|
|
|
|
@@ -306,10 +307,10 @@
|
|
|
:loading="addLoading">保存并编辑工序</el-button>
|
|
|
<el-button v-if="prodEditActive == 1" type="primary" @click="submitSequence(0)"
|
|
|
:loading="addLoading">保存工序</el-button>
|
|
|
- <el-button v-if="prodEditActive == 1" type="primary" @click="submitSequence(1)"
|
|
|
+ <!-- <el-button v-if="prodEditActive == 1" type="primary" @click="submitSequence(1)"
|
|
|
:loading="addLoading">保存并编辑物料</el-button>
|
|
|
<el-button v-if="prodEditActive == 2" type="primary" @click="submitMaterial()"
|
|
|
- :loading="addLoading">保存物料</el-button>
|
|
|
+ :loading="addLoading">保存物料</el-button> -->
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
|
|
|
@@ -1073,13 +1074,13 @@ export default {
|
|
|
|
|
|
|
|
|
})
|
|
|
- this.http.post("/prod-material/getVersions", { productId: row.id },
|
|
|
+ /* 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)
|
|
|
|
|
|
- })
|
|
|
+ }) */
|
|
|
}
|
|
|
},
|
|
|
getProdProcedureVersion(id, index) {
|
