| .env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/api/basicData/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/inspectionApplication/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/nonConformingFeedback/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/reportAuditing/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/standardLibrary/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -2,4 +2,4 @@ ENV = 'development' # base api VUE_APP_BASE_API = 'http://192.168.218.96:1234/' VUE_APP_BASE_API = 'http://localhost:1234/' src/api/basicData/index.js
@@ -9,7 +9,14 @@ selectproductModelById: "/productModel/selectproductModelById", // 根据id查询 updateProductModel: "/productModel/writeproductModel", // 更新标准 -->编辑 deleteList: "/productModel/delAllproductModel", // 批量删除 getSample: "/material/getSample" //获取基础数据样品名称 } export function getSample() { return request({ url: Api.getSample, method: 'get' }) } export function addStandardProjectGroupApi() { src/views/experiment/inspectionApplication/index.vue
@@ -63,9 +63,9 @@ <el-table-column prop="createTime" label="登记日期" min-width="90px" /> <el-table-column prop="inspection_status" label="检验结果" min-width="95px"> <template slot-scope="scope"> <el-tag class="tag" effect="dark" type="danger" disable-transitions <el-tag style="text-align: center;" class="tag" effect="dark" type="danger" disable-transitions v-if="scope.row.inspection_status == 0">不合格</el-tag> <el-tag class="tag" effect="dark" type="success" disable-transitions <el-tag style="text-align: center;" class="tag" effect="dark" type="success" disable-transitions v-else-if="scope.row.inspection_status == 1">合格</el-tag> </template> </el-table-column> src/views/experiment/nonConformingFeedback/index.vue
@@ -14,7 +14,7 @@ <el-form-item> <el-button type="primary" size="small" @click="getData()">查询</el-button> <el-button type="primary" size="small" plain @click="resetData()">重置</el-button> <el-dropdown style="margin-left: 7px;"> <!-- <el-dropdown style="margin-left: 7px;"> <span class="el-dropdown-link"> 高级搜索<i class="el-icon-arrow-down el-icon--right"></i> </span> @@ -25,7 +25,7 @@ <el-dropdown-item disabled>双皮奶</el-dropdown-item> <el-dropdown-item divided>蚵仔煎</el-dropdown-item> </el-dropdown-menu> </el-dropdown> </el-dropdown> --> </el-form-item> </el-form> <el-form style="margin-top: 10px;"> src/views/experiment/reportAuditing/index.vue
@@ -63,7 +63,7 @@ </span> </template></el-table-column > <el-table-columne <el-table-column prop="materialName" label="样品名称" min-width="10%" @@ -134,7 +134,7 @@ reportTable: [], page: 1, total: 0, pageSize: 8, pageSize: 10, checkskipvisible: false, form:{}, formLabelWidth: '120px', @@ -182,11 +182,6 @@ this.reportTable[this.tableRow.$index].status=1 this.transmitData(this.tableRow.row.id,1) this.checkskipvisible= false this.$message({ message: '通过成功', type: 'success' }); this.getData(); }, //不通过 nocheckskip(row) { @@ -194,16 +189,12 @@ this.reportTable[this.tableRow.$index].status=0 this.transmitData(this.tableRow.row.id,2) this.checkskipvisible= false this.$message({ message: '待通过', type: 'warning' }); this.getData(); }, //审核 async transmitData(id, result) { let param={"id":id,"result":result} let data = await checkApi(param) await this.getData(); }, // 查询列表 async getData() { @@ -214,6 +205,7 @@ status: this.checkStatus ? this.checkStatus : undefined, }; const { data } = await selectAllReportCheck(params); console.log(data); this.reportTable = data.row; this.total = data.total; }, src/views/standardLibrary/index.vue
@@ -7,8 +7,7 @@ <el-input size="small" clearable v-model="filterText" placeholder="输入关键字进行过滤"></el-input> </el-col> <el-col :span="5"> <el-button size="small" type="primary" icon="el-icon-plus" @click="addTreeFormVisible = true"></el-button> <el-button size="small" type="primary" icon="el-icon-plus" @click="addSdantard()"></el-button> </el-col> </el-row> <el-button size="small" type="text">全部</el-button> @@ -73,12 +72,17 @@ </div> <el-dialog class="addTree" title="添加标准指标" width="28%" :visible.sync="addTreeFormVisible"> <el-form v-model="addTreeForm" label-position="top"> <el-form-item label="标准类型"> <el-form-item :required="true" label="标准类型"> <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions" :props="{ ...defaultProps, checkStrictly: true }" clearable @change="changeCascader" /> </el-form-item> <el-form-item v-show="addTreeForm.addTypeArr.length < 2" label="物料名称"> <el-input @change="changeSample" v-model="addTreeForm.materialName" /> <el-form-item :required="true" v-show="addTreeForm.addTypeArr.length < 2" label="物料名称"> <el-select style="width: 100%;" @blur="changeSample" v-model="addTreeForm.materialName" placeholder="请选择"> <el-option v-for="item in materialList" :key="item.material" :label="item.material" :value="item.material"> </el-option> </el-select> </el-form-item> <el-form-item v-show="addTreeForm.addTypeArr.length < 3" label="执行标准"> <el-input v-model="addTreeForm.standardName" /> @@ -138,6 +142,7 @@ } from "@/api/standardLibrary"; import { addStandardProjectGroupApi, getSample } from "@/api/basicData/index"; export default { data() { @@ -187,7 +192,8 @@ specificationsName: "", materialName: "", standardName: "", } }, materialList: [] }; }, watch: { @@ -221,6 +227,11 @@ }, methods: { async addSdantard() { this.addTreeFormVisible = true let res = await getSample() this.materialList = res.data }, querySearch(queryString, cb) { var restaurants = [] this.projectGroupingOptions.forEach(a => { @@ -245,22 +256,15 @@ this.addTreeForm.standardName = '' }, changeSample() { let selectType = this.standardTree.filter(item => { return item.id === this.addTreeForm.addTypeArr[0] })[0]; if (this.addTreeForm.addTypeArr.length == 1) { let samples = selectType.children.filter(item => { return item.name === this.addTreeForm.materialName })[0] if (samples === undefined || samples === []) { this.$message({ message: '请先在基础数据中添加该【' + this.addTreeForm.materialName + '】样品', type: 'warning' }); return false; } if (this.addTreeForm.materialName != null && this.addTreeForm.materialName != '') { return true } else { this.$message({ message: '请先选择物料！', type: 'warning' }); return false } return true }, oneSize() { }, twoSize() { @@ -464,14 +468,15 @@ }); return } let handelerSample = this.changeSample() if (!handelerSample) { return; } let res = null; // return; try { switch (this.addTreeForm.addTypeArr.length) { case 1: let handelerSample = this.changeSample() if (!handelerSample) { return; } res = await addMaterial({ ...this.addTreeForm, type: this.addTreeForm.addTypeArr[0],
