This commit is contained in:
bb_pan 2025-06-16 17:27:41 +08:00
parent 9085405a53
commit 2a8f797528
5 changed files with 39 additions and 17 deletions

View File

@ -31,7 +31,7 @@
:options="proList" :normalizer="normalizer" :options="proList" :normalizer="normalizer"
:show-count="true" style="width: 240px" :disable-branch-nodes="true" :show-count="true" style="width: 240px" :disable-branch-nodes="true"
noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果" noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
placeholder="请选择结算工程" @select="proChange" placeholder="请选择结算工程" @select="proChange" :disabled="unitIds.length == 0"
/> />
<!-- <el-cascader v-model="projectIds" <!-- <el-cascader v-model="projectIds"
:show-all-levels="false" :show-all-levels="false"
@ -255,7 +255,7 @@ import printJS from 'print-js'
export default { export default {
name: 'CostApplyList', name: 'CostApplyList',
dicts: ['cost_status'], dicts: ['cost_status'],
components: { Treeselect }, components: { Treeselect, vueEasyPrint },
data() { data() {
return { return {
// //
@ -479,14 +479,14 @@ export default {
}, },
// //
print() { print() {
// this.$refs.remarksPrintRef.print(); this.$refs.remarksPrintRef.print();
printJS({ // printJS({
printable: 'checkId', // printable: 'checkId',
type: 'html', // type: 'html',
targetStyles: ['*'], // targetStyles: ['*'],
maxWidth:'1400' // maxWidth:'1400'
// // //
}); // });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */

View File

@ -233,7 +233,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: 'CostApplyList', name: 'CostApplyList',
dicts: ['cost_status'], dicts: ['cost_status'],
components: { Treeselect }, components: { Treeselect, vueEasyPrint },
data() { data() {
return { return {
// //

View File

@ -11,7 +11,7 @@
label-width="90px" label-width="90px"
> >
<el-form-item label="类型规格:" prop="typeId"> <el-form-item label="类型规格:" prop="typeId">
<el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable> <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable style="width: 240px">
<el-option v-for="dict in materialModelList" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in materialModelList" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>

View File

@ -8,14 +8,22 @@
ref="maFormRef" ref="maFormRef"
label-width="100px" label-width="100px"
> >
<el-form-item label="类型规格" prop="keyWord"> <el-form-item label="类型规格" prop="typeId">
<el-input <!-- <el-input
clearable clearable
maxlength="50" maxlength="50"
style="width: 240px" style="width: 240px"
v-model="maForm.keyWord" v-model="maForm.keyWord"
placeholder="请输入类型规格" placeholder="请输入类型规格"
/> -->
<el-select v-model="maForm.typeId" placeholder="请选择类型规格" clearable filterable style="width: 240px">
<el-option
v-for="dict in materialModelList"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/> />
</el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="机具厂家" prop="typeId"> <!-- <el-form-item label="机具厂家" prop="typeId">
@ -419,7 +427,7 @@ import {
uploadPurchaseFile, uploadPurchaseFile,
getPurchaseFileList, getPurchaseFileList,
} from "@/api/purchase/goodsAccept"; } from "@/api/purchase/goodsAccept";
import { number } from "echarts"; import { getDeviceType} from "@/api/ma/device"
export default { export default {
name: "BindTools", name: "BindTools",
@ -508,7 +516,9 @@ export default {
keyWord: "", keyWord: "",
productionTime: "", productionTime: "",
taskStage: 3, taskStage: 3,
typeId: ''
}, },
materialModelList: [],
taskId: "", taskId: "",
// //
open: false, open: false,
@ -539,8 +549,20 @@ export default {
mounted() { mounted() {
this.taskId = this.queryTaskId; this.taskId = this.queryTaskId;
this.getCodeList(); this.getCodeList();
this.getDeviceType()
}, },
methods: { methods: {
getDeviceType(){
getDeviceType({level:4,skipPermission:1}).then(response => {
let matModelRes = response.data;
this.materialModelList = matModelRes.map((item) => {
return {
label: item.typeName,
value: item.typeId,
};
});
});
},
// //
async getCodeList() { async getCodeList() {
this.loading = true; this.loading = true;

View File

@ -2,7 +2,7 @@
<div class="app-container" id="entryDetail"> <div class="app-container" id="entryDetail">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
<el-form-item label="类型规格:" prop="typeId" > <el-form-item label="类型规格:" prop="typeId" >
<el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable> <el-select v-model="queryParams.typeId" placeholder="请选择类型规格" clearable filterable style="width: 240px">
<el-option <el-option
v-for="dict in materialModelList" v-for="dict in materialModelList"
:key="dict.value" :key="dict.value"