zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

This commit is contained in:
caoqianming 2026-01-06 11:20:57 +08:00
parent 8f6ef463b0 2164aac5bd
commit a8f158935a
32 changed files with 718 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/api/model/pum.js
View File

@ -313,5 +313,39 @@ export default {
);
}
},
},
quotation: {
list: {
name: "报价单列表",
req: async function(data){
return await http.get(
`${config.API_URL}/pum/quotation/`,
data
);
}
},
item: {
req: async function(id){
return await http.get(
`${config.API_URL}/pum/quotation/${id}/`,
);
}
},
create: {
name: "新增",
req: async function(data){
return await http.post(
`${config.API_URL}/pum/quotation/`,
data);
}
},
delete: {
name: "删除",
req: async function(id){
return await http.delete(
`${config.API_URL}/pum/quotation/${id}/`
);
}
},
}
}

6
src/api/model/qm.js
View File

@ -365,5 +365,11 @@ export default {
return await http.post(`${config.API_URL}/qm/ftestwork/${id}/submit/`);
},
},
revert: {
name: "撤回检验工作",
req: async function (id) {
return await http.post(`${config.API_URL}/qm/ftestwork/${id}/revert/`);
},
},
},
};

9
src/api/model/wpm.js
View File

@ -309,6 +309,15 @@ export default {
);
},
},
patchOut: {
name: "局部更新",
req: async function (id, data) {
return await http.patch(
`${config.API_URL}/wpm/mlogb/out/${id}/`,
data
);
},
},
},
mlogbdefect: {
list: {

4
src/utils/request.js
View File

@ -96,8 +96,8 @@ axios.interceptors.response.use(
}else {
if (error.config.url.indexOf('prints')>-1) {
ElNotification.error({
title: '驱动未打开',
message: "请先运行打印驱动，再进行打印操作！"
title: '打印报错',
message: "打印机未设置或打印服务未启动，请确认后再进行打印操作！"
});
} else {
ElNotification.error({

17
src/views/bigScreen/index_enm_bh.vue
View File

@ -19,7 +19,7 @@
<div class="totalNumContnier">
<div class="totalNumWrap totalNum_orange">
<img class="" src="img/number_bg_orange.png" />
<span class="totalNumText">本月石灰产量</span>
<span class="totalNumText">本月氧化钙产量</span>
<div class="totalNumber">
{{ totalData.shuliao }}
</div>
@ -207,12 +207,12 @@
<div class="flexItem">
<div class="itemTitle">
<div class="itemTitleIcon"></div>
<div>能源数据</div>
<div>本月能源单耗</div>
</div>
<div class="itemBody" style="padding: 5%">
<div class="elecItem">
<div class="elecItem_wrap">
<span>本月氧化钙综合电耗</span>
<span>氧化钙综合电耗</span>
<p class="elec_number">
{{ (Number(hotData.celec_consume_unit)+Number(dicData.elec_month)).toFixed(2) }}
<span class="elec_unit">kW·h</span>
@ -221,7 +221,7 @@
</div>
<div class="elecItem">
<div class="elecItem_wrap">
<span>本月氧化钙综合煤耗</span>
<span>氧化钙综合煤耗</span>
<p class="elec_number">
{{ (Number(hotData.coal_consume_unit)*1000+Number(dicData.elec_year)*1000).toFixed(2) }}
<span class="elec_unit">kgce/t</span>
@ -230,7 +230,7 @@
</div>
<div class="elecItem">
<div class="elecItem_wrap">
<span>本月氧化钙综合能耗</span>
<span>氧化钙综合能耗</span>
<p class="elec_number">
{{ (Number(hotData.cen_consume_unit)).toFixed(2)}}
<span class="elec_unit">kgce/t</span>
@ -1122,16 +1122,17 @@ export default {
that.hotData.cen_consume_unit = Number(ress[0].cen_consume_unit).toFixed(2);
that.hotData.celec_consume_unit =Number(ress[0].celec_consume_unit).toFixed(2);
params.mpoint = mpoint
total_production = ress[0].total_production;
total_production = ress[0].total_production; // 出窑的产量（氧化钙）
return that.$API.enm.mpointstat.list.req(params);
// that.hotData.coal_consume_unit =Number(ress[0].coal_consume_unit).toFixed(2);
}).then((res) => {
if( res.length>0 ){
let ratio = (Number(res[0].val)/Number(total_production));
//
let ratio = (Number(res[0].val)/Number(total_production)); //煤粉消耗量/出窑的产量（氧化钙）
if (ratio > 0.135){
that.hotData.coal_consume_unit = 0.130;
}else{
that.hotData.coal_consume_unit = Number(ratio[0].val)/Number(total_production).toFixed(2);
that.hotData.coal_consume_unit = ratio; //煤粉消耗量/出窑的产量（氧化钙）
}
}
}

15
src/views/inm/good_mio.vue
View File

@ -123,16 +123,7 @@
v-auth="'mio.submit'"
v-if="scope.row.state == 20"
>
撤销
</el-button>
<el-button
link
type="warning"
@click="revert(scope.row)"
v-auth="'mio.submit'"
v-if="scope.row.state == 20"
>
撤销
撤回
</el-button>
<el-button
link
@ -260,14 +251,14 @@ export default {
.catch(() => {});
},
revert(row) {
this.$confirm(`确定撤销该操作吗？`, "提示", {
this.$confirm(`确定撤回该操作吗？`, "提示", {
type: "warning",
})
.then(() => {
this.$API.inm.mio.revert
.req(row.id)
.then((res) => {
this.$message.success("撤销成功");
this.$message.success("撤回成功");
this.$refs.table.refresh();
return res;
})

6
src/views/inm/halfgood_mio.vue
View File

@ -145,7 +145,7 @@
v-auth="'mio.submit'"
v-if="scope.row.state == 20"
>
撤销
撤回
</el-button>
</template>
</el-table-column>
@ -259,14 +259,14 @@ export default {
.catch(() => {});
},
revert(row) {
this.$confirm(`确定撤销该操作吗？`, "提示", {
this.$confirm(`确定撤回该操作吗？`, "提示", {
type: "warning",
})
.then(() => {
this.$API.inm.mio.revert
.req(row.id)
.then((res) => {
this.$message.success("撤销成功");
this.$message.success("撤回成功");
this.$refs.table.refresh();
return res;
})

6
src/views/inm/mainso_mio.vue
View File

@ -154,7 +154,7 @@
v-auth="'mio.submit'"
v-if="scope.row.state == 20"
>
撤销
撤回
</el-button>
</template>
</el-table-column>
@ -275,14 +275,14 @@ export default {
.catch(() => {});
},
revert(row) {
this.$confirm(`确定撤销该操作吗？`, "提示", {
this.$confirm(`确定撤回该操作吗？`, "提示", {
type: "warning",
})
.then(() => {
this.$API.inm.mio.revert
.req(row.id)
.then((res) => {
this.$message.success("撤销成功");
this.$message.success("撤回成功");
this.$refs.table.refresh();
return res;
})

6
src/views/inm/mio.vue
View File

@ -127,7 +127,7 @@
(scope.row.type == 'other_in' ||
scope.row.type == 'other_out')"
>
撤销
撤回
</el-button>
<el-button
link
@ -269,14 +269,14 @@ export default {
});
},
revert(row) {
this.$confirm(`确定撤销该操作吗？`, "提示", {
this.$confirm(`确定撤回该操作吗？`, "提示", {
type: "warning",
})
.then(() => {
this.$API.inm.mio.revert
.req(row.id)
.then((res) => {
this.$message.success("撤销成功");
this.$message.success("撤回成功");
this.$refs.table.refresh();
return res;
})

208
src/views/inm/mioitem_check.vue
View File

@ -7,7 +7,7 @@
@closed="$emit('closed')"
>
<el-container v-loading="loading">
<el-main style="padding: 0 20px 20px 20px">
<el-main style="padding: 0">
<el-form
ref="dialogForm"
:model="form"
@ -593,7 +593,139 @@
</el-col>
</el-row>
<!-- 入厂检验 -->
<el-row v-if="type == 'pur_in'">
<el-row v-if="type == 'pur_in'&&project_code=='gx'">
<el-col :md="12" :sm="24">
<el-form-item label="产品名称:" label-width="100">
{{ objitem.material_name }}
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="入厂批次号:" label-width="100">
{{ objitem.batch }}
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="批次号" required label-width="100">
<el-input v-model="form.batch"> </el-input>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="接收总数" required label-width="100">
<el-input-number
v-model="form.count"
:min="0"
style="width: 100%"
controls-position="right"
@change="gxPurInCountChange"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="合格数" label-width="100">
<el-input-number
v-model="form.count_ok"
disabled
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="不合格数量" label-width="100">
<el-input
v-model="form.count_notok"
disabled
style="width: 100%"
placeholder="不合格数量"
/>
</el-form-item>
</el-col>
<el-col>异常项：</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="直径" label-width="100">
<el-input-number
v-model="form.count_n_zw"
:min="0"
style="width: 100%"
controls-position="right"
@change="nqtChange"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="长度" label-width="100">
<el-input-number
v-model="form.count_n_dl"
:min="0"
style="width: 100%"
controls-position="right"
@change="nqtChange"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="崩面" label-width="100">
<el-input-number
v-model="form.count_n_b"
:min="0"
style="width: 100%"
controls-position="right"
@change="nqtChange"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="亮面" label-width="100">
<el-input-number
v-model="form.count_n_zz"
:min="0"
style="width: 100%"
controls-position="right"
@change="nqtChange"
>
</el-input-number>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="检验日期" prop="test_date" label-width="100">
<el-date-picker
v-model="form.test_date"
type="date"
value-format="YYYY-MM-DD"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="检验员" prop="test_user" label-width="100">
<el-select
v-model="form.test_user"
placeholder="检验员"
clearable
filterable
style="width: 100%"
>
<el-option
v-for="item in userList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="备注" label-width="100">
<el-input v-model="form.test_note"> </el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="type == 'pur_in'&&project_code!='gx'">
<el-col :md="12" :sm="24">
<el-form-item label="产品名称:">
{{ objitem.material_name }}
@ -605,16 +737,6 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item v-if="project_code === 'gx'" label="总数">
<el-input-number
v-model="form.count"
:min="0"
disabled="true"
style="width: 100%"
controls-position="right"
>
</el-input-number>
</el-form-item>
<el-form-item v-if="project_code === 'gz'" label="总袋（桶）数">
<el-input-number
v-model="form.count_bag"
@ -626,26 +748,8 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="不合格数量" v-if="project_code === 'gx'&&type == 'pur_in'">
<el-form-item label="抽样数量">
<el-input
disabled
v-model="form.count_notok"
placeholder="不合格数量"
/>
</el-form-item>
<el-form-item label="抽样数量" v-else>
<!-- 光芯 -->
<el-input-number
v-if="project_code === 'gx'"
v-model="form.count_sampling"
:min="0"
style="width: 100%"
controls-position="right"
>
</el-input-number>
<!-- 光子 -->
<el-input
v-else
disabled
v-model="form.count_sampling"
placeholder="抽样数量"
@ -681,17 +785,7 @@
</el-form-item>
</el-col>
<el-col :md="12" :sm="24">
<el-form-item label="崩边" v-if="project_code === 'gx'&&type == 'pur_in'">
<el-input-number
v-model="form.count_n_qt"
:min="0"
style="width: 100%"
controls-position="right"
@change="nqtChange"
>
</el-input-number>
</el-form-item>
<el-form-item label="检验合格" prop="is_testok" v-else>
<el-form-item label="检验合格" prop="is_testok">
<el-select
v-model="form.is_testok"
placeholder="检验合格"
@ -995,8 +1089,11 @@ export default {
},
mounted() {
let that = this;
let date = new Date();
let config_base = that.$TOOL.data.get("BASE_INFO").base;
that.form.test_date = that.$TOOL.dateFormat2(date, "yyyy-MM-dd");
that.project_code = config_base.base_code;
console.log("that.form.test_date", that.form.test_date);
setTimeout(() => {
this.tableHeight = document.getElementById('mioitemwMain').clientHeight-20;
},500)
@ -1011,7 +1108,14 @@ export default {
that.form.material_name = that.objitem.material_name;
that.form.batch = that.objitem.batch;
that.form.count = that.objitem.count;
that.form.count_ok = that.objitem.count;
that.form.count_bag = that.objitem.count_bag;
if(that.project_code=='gx'){
that.form.count_n_zw = 0;//直径
that.form.count_n_zz = 0;//亮面
that.form.count_n_b = 0;//崩面
that.form.count_n_dl = 0;//长度
}
}
if (
(that.type == "do_in" && that.cate == "halfgood") ||
@ -1096,8 +1200,12 @@ export default {
}
return this;
},
gxPurInCountChange(){
this.form.count_ok = this.form.count - this.form.count_notok;
},
nqtChange(){
this.form.count_notok = this.form.count_n_qt;
this.form.count_notok = this.form.count_n_zw+this.form.count_n_zz+this.form.count_n_b+this.form.count_n_dl;
this.form.count_ok = this.form.count - this.form.count_notok;
},
getMaterialItem(){
let that = this;
@ -1373,14 +1481,12 @@ export default {
that.$message.success("操作成功");
});
} else {
that.$API.inm.mioitem.test
.req(that.mioitemId, that.form)
.then((res) => {
that.isSaveing = false;
that.$emit("success");
that.visible = false;
that.$message.success("操作成功");
});
that.$API.inm.mioitem.test.req(that.mioitemId, that.form).then((res) => {
that.isSaveing = false;
that.$emit("success");
that.visible = false;
that.$message.success("操作成功");
});
}
} catch (err) {
//可以处理校验错误

13
src/views/inm/mioitem_form.vue
View File

@ -195,6 +195,11 @@
</el-form-item>
</el-col>
</el-row>
<el-col v-if="form.type == 'pur_in'&&project_code=='bxerp'&& cate == 'halfgood'">
<el-form-item label="编号前缀">
<el-input v-model="halfgoodprefix" @input="halfgoodprefixChange" placeholder="编号前缀"/>
</el-form-item>
</el-col>
<el-row v-if="mTracking==20&&form.count>0&&(form.type == 'pur_in'||form.type == 'other_in'||(form.type == 'sale_out'&&project_code=='bxerp'))">
<el-col :md="12" :sm="24" v-for="i in form.count" :key="i">
<el-form-item :label="'编号'+i" required>
@ -320,6 +325,7 @@ export default {
mioitemw:[],
wprList:[],
prefix:'',
halfgoodprefix:'',
count_send_yp:0,
project_code:'',
digitNum:null,
@ -777,6 +783,13 @@ export default {
})
},
halfgoodprefixChange(){
let that = this;
that.mioitems = [];
for(let i=0;i<that.form.count;i++){
that.mioitems[i] = that.halfgoodprefix;
}
},
validateInput(i){
this.mioitems[i] = this.mioitems[i].replace(/\D/g, '');
},

31
src/views/inm/mioitemlist.vue
View File

@ -29,6 +29,20 @@
>
<el-table-column label="物料" prop="full_name"></el-table-column>
</xtSelect>
<el-select
v-model="params.mio__type"
clearable
style="width: 120px; margin-left: 2px"
placeholder="出入库类型"
@change="handleQuery"
>
<el-option
v-for="item in cateOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
<el-input
v-model="params.search"
placeholder="名称"
@ -171,6 +185,7 @@ export default {
with_mio:'yes',
material__type:40,
mio__state:20,
mio__type:'',
mio__inout_date__gte:'',
mio__inout_date__lte:'',
material:'',
@ -197,13 +212,21 @@ export default {
20: "已提交",
},
typeDict: {
do_out: "生产领料",
sale_out: "销售发货",
pur_in: "采购入库",
do_in: "生产入库",
do_out: "生产领料",
borrow_out: "领用出库",
return_in: "退还入库",
pur_out: "采购退货",
other_in: "其他入库",
other_out: "其他出库",
},
cateOptions: [
{ id: "pur_in", name: "采购入库" },
{ id: "do_out", name: "生产领料" },
{ id: "borrow_out", name: "领用出库" },
{ id: "return_in", name: "退还入库" },
{ id: "pur_out", name: "采购退货"},
{ id: "other_in", name: "其他入库"},
],
selectObj: {},
apiObj:this.$API.inm.mioitem.list,
apiObjm:this.$API.mtm.material.list,

6
src/views/login/components/passwordForm.vue
View File

@ -108,8 +108,10 @@ export default {
},
},
mounted() {
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
console.log('this.project_code',this.project_code);
this.$nextTick(()=>{
this.project_code = this.$TOOL.data.get("BASE_INFO").base.base_code;
console.log('this.project_code',this.project_code);
});
},
methods: {
async login() {

57
src/views/pum/quotation.vue Normal file
View File

@ -0,0 +1,57 @@
<template>
<el-container>
<el-header>
<div class="left-panel">
<el-button type="primary" @click="handleAdd">新增</el-button>
</div>
</el-header>
<el-main class="nopadding">
<scTable
ref="table"
:apiObj="API.pum.quotation.list"
row-key="id"
stripe
:query="query"
@row-click="(row)=>{t_id=row.id;mode='show';drawerVisible=true;}"
>
<el-table-column label="客户名称" prop="customer_name" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="审批状态" width="200" show-overflow-tooltip>
<template #default="scope">
<el-tag :type="actStateEnum[scope.row.ticket_?.act_state]?.type">
{{ actStateEnum[scope.row.ticket_?.act_state]?.text }}
</el-tag>
<el-tag type="info" effect="plain">{{ scope.row.ticket_?.state_.name }}</el-tag>
</template>
</el-table-column>`
<el-table-column label="产品名称" prop="product_name" width="100" show-overflow-tooltip></el-table-column>`
<el-table-column label="联系人" prop="contact_person" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="联系电话" prop="contact_phone" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="收件地址" prop="receive_address" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="产品规格/数量" prop="product_spec_quantity" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="报价依据" prop="receive_address" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="建议价格及计算方式" prop="product_spec_quantity" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="报价区间" prop="receive_address" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="报价人" prop="product_spec_quantity" width="100" show-overflow-tooltip></el-table-column>
<el-table-column label="申请日期" prop="apply_date" width="100" show-overflow-tooltip></el-table-column>
</scTable>
</el-main>
</el-container>
<el-drawer title="报价审核" v-model="drawerVisible" :size="'80%'" destroy-on-close>
<quotation_form :mode="mode" :t_id="t_id"></quotation_form>
</el-drawer>
</template>
<script setup>
import { ref } from 'vue'
import API from '@/api'
import quotation_form from './quotation_form.vue'
import { actStateEnum, interveneTypeEnum } from "@/utils/enum.js";
const query = ref({});
const drawerVisible = ref(false);
const mode = ref('add');
const t_id = ref(null);
const handleAdd = () => {
mode.value = 'add';
drawerVisible.value = true;
}
</script>

149
src/views/pum/quotation_form.vue Normal file
View File

@ -0,0 +1,149 @@
<template>
<el-container>
<el-main class="nopadding">
<el-form label-width="150px" :model="formData" style="padding: 20px;">
<el-form-item label="客户名称" required>
<el-input v-model="formData.customer_name" placeholder="请输入客户名称" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="产品名称" required>
<el-input v-model="formData.product_name" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="联系人" required>
<el-input v-model="formData.contact_person" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="联系电话" required>
<el-input v-model="formData.contact_phone" type="number" min="0" clearable :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="收件地址" required>
<el-input v-model="formData.receive_address" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="产品规格/数量" required>
<el-input v-model="formData.product_spec_quantity" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="报价依据" required>
<el-input v-model="formData.quotation_basis" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="建议价格及计算方式" required>
<el-input v-model="formData.suggested_price_calc" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="报价区间" required>
<el-input v-model="formData.quotation_range" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="报价人" required>
<el-input v-model="formData.quoter" :readonly="localMode === 'show'"></el-input>
</el-form-item>
<el-form-item label="申请日期" required>
<el-date-picker
v-model="formData.apply_date"
type="date"
placeholder="选择日期时间"
align="right"
value-format="YYYY-MM-DD">
</el-date-picker>
</el-form-item>
</el-form>
<el-footer>
<el-button type="danger"
v-if="localMode=='edit'"
:loading="saveLoading"
style="margin-right: 4px;"
@click="handleDel"
>删除</el-button>
<ticketd_b
v-if ="formData.ticket_"
:t_id="formData.id"
:ticket_="formData.ticket_"
@success="$emit('success', localMode)"
ref="ticketd_b"
></ticketd_b>
<el-button
v-else
type="primary"
style="margin-right: 4px;"
@click="handleSave"
v-auth="'supplieraudit.delete'"
:loading="saveLoading"
>提交审批</el-button>
</el-footer>
</el-main>
<el-aside width="20%" v-if="formData.ticket_">
<ticketd :ticket_="formData.ticket_" @success="$emit('success')"></ticketd>
</el-aside>
</el-container>
</template>
<script>
import ticketd_b from "@/views/wf/ticketd_b.vue";
import ticketd from '@/views/wf/ticketd.vue'
export default {
components: {
ticketd_b,
ticketd
},
props: {
mode: {
type: String,
default: 'show'
},
t_id: {
type: String,
default: ""
}
},
data() {
return {
formData: {
},
localMode: this.mode,
saveLoading: false,
}
},
watch: {
mode(newVal) {
this.localMode = newVal;
}
},
mounted() {
if (this.t_id) {
this.getTid();
} else {
this.localMode = "add";
}
},
methods: {
async getTid() {
let res = await this.$API.pum.quotation.item.req(this.t_id);
this.formData = res;
if (res.ticket_ && res.ticket_.state_.type == 1 && res.create_by == this.$TOOL.data.get("USER_INFO").id) {
this.localMode = "edit";
}
},
handleDel() {
this.$confirm(`确定删除吗？`, "提示", {
type: "warning",
})
.then(()=>{
this.$API.pum.quotation.delete.req(this.formData.id).then(res=>{
this.$message.success("删除成功");
this.$emit('success');
})
})
},
handleSave() {
if (this.localMode == "add") {
this.saveLoading = true;
this.$API.pum.quotation.create.req(this.formData).then(res=>{
this.saveLoading = true;
this.$message.success("提交成功");
this.$emit('success', this.localMode);
}).catch(e=>{
this.saveLoading = false;
})
} else if (this.localMode == "edit") {
this.$message.error("不支持编辑!")
}
},
}
}
</script>

17
src/views/statistics/bxerp/cpccjc.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品尺寸检测_批次号 }}</span>
@ -115,9 +116,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品尺寸检测_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

17
src/views/statistics/bxerp/cpwgfj1.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品外观复检一_批次号 }}</span>
@ -145,9 +146,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品外观复检一_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

17
src/views/statistics/bxerp/cpwgfj2.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品外观复检二_批次号 }}</span>
@ -145,9 +146,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品外观复检二_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

17
src/views/statistics/bxerp/cpwgnzcj.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品内外初检_批次号 }}</span>
@ -240,9 +241,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品内外初检_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){

17
src/views/statistics/bxerp/cpwgnzfj.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品内质复检_批次号 }}</span>
@ -240,9 +241,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品内外初检_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){

17
src/views/statistics/bxerp/cpxnjy.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品性能检测_批次号 }}</span>
@ -155,9 +156,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品性能检测_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

17
src/views/statistics/bxerp/cpzj.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.成品自检_批次号 }}</span>
@ -195,9 +196,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__成品自检_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

17
src/views/statistics/bxerp/fenjian.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.分检_批次号 }}</span>
@ -129,9 +130,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__分检_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

17
src/views/statistics/bxerp/gzcpjc.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -31,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.光锥成品检测_批次号 }}</span>
@ -125,9 +126,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__光锥成品检测_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){

56
src/views/statistics/bxerp/maopi.vue
View File

@ -2,6 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -12,11 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button>
</div>
</el-header>
<el-main class="nopadding">
@ -32,6 +32,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.毛坯检测_批次号 }}</span>
@ -202,9 +204,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__毛坯检测_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);
@ -234,64 +236,64 @@ export default {
return;
}
let propert = '';
if(index == 4&&column.label=='合格数'){
if(index == 5&&column.label=='合格数'){
propert= '毛坯检测_缺陷项_放大率￠2mm不合格';
}
if(index == 6&&column.label=='合格数'){
if(index == 7&&column.label=='合格数'){
propert= '毛坯检测_缺陷项_放大率￠16mm不合格';
}
if(index == 9&&column.label=='合格数'){
if(index == 10&&column.label=='合格数'){
propert= '毛坯检测_缺陷项_剪切￠18.3mm不合格';
}
if(index == 10&&column.label=='可加工'){
if(index == 11&&column.label=='可加工'){
propert= '毛坯检测_缺陷项_剪切￠18.3mm可加工';
}
if(index == 11&&column.label=='内标合格'){
if(index == 12&&column.label=='内标合格'){
propert= '毛坯检测_缺陷项_暗点合格';
}
if(index == 12&&column.label=='长点不合格'){
if(index == 13&&column.label=='长点不合格'){
propert= '毛坯检测_缺陷项_暗点不合格';
}
if(index == 13&&column.label=='可加工'){
if(index == 14&&column.label=='可加工'){
propert= '毛坯检测_缺陷项_暗点合格';
}
if(index == 14&&column.label=='暗点重'){
if(index == 15&&column.label=='暗点重'){
propert= '毛坯检测_缺陷项_暗点重';
}
if(index == 15&&column.label=='花丝'){
if(index == 16&&column.label=='花丝'){
propert= '毛坯检测_缺陷项_花丝';
}
if(index == 16&&column.label=='网格'){
if(index == 17&&column.label=='网格'){
propert= '毛坯检测_缺陷项_网格';
}
if(index == 17&&column.label=='轻'){
if(index == 18&&column.label=='轻'){
propert= '毛坯检测_缺陷项_花朵';
}
if(index == 18&&column.label=='重'){
if(index == 19&&column.label=='重'){
propert= '毛坯检测_缺陷项_花朵重';
}
if(index == 19&&column.label=='S畸变不合格'){
if(index == 20&&column.label=='S畸变不合格'){
propert= '毛坯检测_缺陷项_S畸变不合格';
}
if(index == 20&&column.label=='弓形畸变不合格'){
if(index == 21&&column.label=='弓形畸变不合格'){
propert= '毛坯检测_缺陷项_弓形畸变不合格';
}
if(index == 21&&column.label=='炸废'){
if(index == 22&&column.label=='炸废'){
propert= '毛坯检测_缺陷项_炸废';
}
if(index == 22&&column.label=='角偏'){
if(index == 23&&column.label=='角偏'){
propert= '毛坯检测_缺陷项_角偏';
}
if(index == 23&&column.label=='色差'){
if(index == 24&&column.label=='色差'){
propert= '毛坯检测_缺陷项_色差';
}
if (propert!=='') {
let values = [];
if(index==4||index==6){
if(index==5||index==7){
values = data.map((item) =>!item.data[propert]?1:0);
}else if(index==9){
}else if(index==10){
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_剪切￠18.3mm可加工']?1:0);
}else if(index==13){
}else if(index==14){
values = data.map((item) =>!item.data[propert]&&!item.data['毛坯检测_缺陷项_暗点不合格']?1:0);
}else{
values = data.map((item) =>item.data[propert]&&item.data[propert]!==undefined?Number(item.data[propert]):0);

16
src/views/statistics/bxerp/niuzhuan.vue
View File

@ -2,11 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<!-- <el-input v-model="query.name__contains"
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input> -->
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -17,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -36,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.扭后检测_批次号 }}</span>
@ -219,9 +215,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__扭后检测_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
querys=[[{field:"wm",value:0,compare:"isnull"},{field:"data__has_key",compare:"",value:"扭后检测_批次号"}]]
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){

44
src/views/statistics/bxerp/zhongjian1.vue
View File

@ -2,11 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<!-- <el-input v-model="query.name__contains"
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input> -->
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -17,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -36,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.中检一_批次号 }}</span>
@ -53,47 +49,47 @@
<span>{{ scope.row.data.中检一_缺陷项_偏?scope.row.data.中检一_缺陷项_偏:0 }}</span>
</template>
</el-table-column>
<el-table-column label="掉头" align="center" class-name="colorheader2">
<el-table-column label="掉头" align="center" class-name="colorheader3">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_掉头?scope.row.data.中检一_缺陷项_掉头:0 }}</span>
</template>
</el-table-column>
<el-table-column label="台阶划伤" align="center" class-name="colorheader1">
<el-table-column label="台阶划伤" align="center" class-name="colorheader4">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_台阶划伤?scope.row.data.中检一_缺陷项_台阶划伤:0 }}</span>
</template>
</el-table-column>
<el-table-column label="柱面划伤" align="center" class-name="colorheader2">
<el-table-column label="柱面划伤" align="center" class-name="colorheader5">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_柱面划伤?scope.row.data.中检一_缺陷项_柱面划伤:0 }}</span>
</template>
</el-table-column>
<el-table-column label="台棱" align="center" class-name="colorheader3">
<el-table-column label="台棱" align="center" class-name="colorheader6">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_台棱?scope.row.data.中检一_缺陷项_台棱:0 }}</span>
</template>
</el-table-column>
<el-table-column label="台糙" align="center" class-name="colorheader4">
<el-table-column label="台糙" align="center" class-name="colorheader7">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_台糙?scope.row.data.中检一_缺陷项_台糙:0 }}</span>
</template>
</el-table-column>
<el-table-column label="尺寸大/小" align="center" class-name="colorheader6">
<el-table-column label="尺寸大/小" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_尺寸大/小']?scope.row.data['中检一_缺陷项_尺寸大/小']:0 }}</span>
</template>
</el-table-column>
<el-table-column label="崩" align="center" class-name="colorheader5">
<el-table-column label="崩" align="center" class-name="colorheader2">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_崩?scope.row.data.中检一_缺陷项_崩:0 }}</span>
</template>
</el-table-column>
<el-table-column label="修崩/炸" align="center" class-name="colorheader7">
<el-table-column label="修崩/炸" align="center" class-name="colorheader3">
<template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_修崩/炸']?scope.row.data['中检一_缺陷项_修崩/炸']:0 }}</span>
</template>
</el-table-column>
<el-table-column label="拆头" align="center" class-name="colorheader7">
<el-table-column label="拆头" align="center" class-name="colorheader4">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_拆头?scope.row.data.中检一_缺陷项_拆头:0 }}</span>
</template>
@ -103,27 +99,27 @@
<span>{{ scope.row.data.中检一_缺陷项_外黑?scope.row.data.中检一_缺陷项_外黑:0 }}</span>
</template>
</el-table-column>
<el-table-column label="外磕" align="center" class-name="colorheader1">
<el-table-column label="外磕" align="center" class-name="colorheader6">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_外磕?scope.row.data.中检一_缺陷项_外磕:0 }}</span>
</template>
</el-table-column>
<el-table-column label="打毛/打台" align="center" class-name="colorheader3">
<el-table-column label="打毛/打台" align="center" class-name="colorheader7">
<template #default="scope">
<span>{{ scope.row.data['中检一_缺陷项_打毛/打台']?scope.row.data['中检一_缺陷项_打毛/打台']:0 }}</span>
</template>
</el-table-column>
<el-table-column label="喷码" align="center" class-name="colorheader6">
<el-table-column label="喷码" align="center" class-name="colorheader1">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_喷码?scope.row.data.中检一_缺陷项_喷码:0 }}</span>
</template>
</el-table-column>
<el-table-column label="掉皮" align="center" class-name="colorheader3">
<el-table-column label="掉皮" align="center" class-name="colorheader2">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_掉皮?scope.row.data.中检一_缺陷项_掉皮:0 }}</span>
</template>
</el-table-column>
<el-table-column label="量崩" align="center" class-name="colorheader4">
<el-table-column label="量崩" align="center" class-name="colorheader3">
<template #default="scope">
<span>{{ scope.row.data.中检一_缺陷项_量崩?scope.row.data.中检一_缺陷项_量崩:0 }}</span>
</template>
@ -175,9 +171,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__中检一_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

16
src/views/statistics/bxerp/zhongjian2.vue
View File

@ -2,11 +2,11 @@
<el-container>
<el-header>
<div class="right-panel">
<!-- <el-input v-model="query.name__contains"
<el-input v-model="query.name__contains"
placeholder="产品名称"
clearable
style="width: 200px;"
></el-input> -->
></el-input>
<el-input v-model="query.batch__contains"
placeholder="批次号"
clearable
@ -17,12 +17,6 @@
icon="el-icon-search"
@click="handleQuery"
></el-button>
<el-button
@click="handleExport"
class="tables"
type="primary"
>导出</el-button
>
</div>
</el-header>
<el-main class="nopadding">
@ -36,6 +30,8 @@
stripe
>
<el-table-column type="index" width="50" fixed="left"/>
<el-table-column label="产品名称" prop="material_name" fixed="left" min-width="100">
</el-table-column>
<el-table-column label="批次号" fixed="left">
<template #default="scope">
<span>{{ scope.row.data.中检二_批次号 }}</span>
@ -175,9 +171,9 @@ export default {
obj2.value = that.query.last_time__lte;
obj2.compare = 'lte';
obj3.field = 'data__中检二_物料名';
obj3.field = 'material__name';
obj3.value = that.query.name__contains;
obj3.compare = '';
obj3.compare = 'contains';
if(that.query.batch__contains!==''&&that.query.batch__contains!==null){
querys[0].push(obj);

81
src/views/statistics/good_check_gx.vue
View File

@ -441,47 +441,90 @@ export default {
let that = this;
that.params.page = 1;
that.params.querys=[];
let arr1 = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"}],
arr2 = [{field:"data__has_key",compare:"",value:"外观检验_日期"}],
arr3 = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"}];
let arrays = {};
if(that.query.batch != "" && that.query.batch != null && that.query.batch != undefined&&that.query.batch.indexOf(' ')){
let arrs = that.query.batch.split(' ');
console.log('arrs',arrs);
arrs.forEach((item, index) => {
let obj = {};
obj.value = item;
obj.field = "batch";
obj.compare = "contains";
let newArrayName1 = 'arr1' + index;
let newArrayName2 = 'arr2' + index;
let newArrayName3 = 'arr3' + index;
console.log('obj',obj);
arrays[newArrayName1] = [{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj];
arrays[newArrayName2] = [{field:"data__has_key",compare:"",value:"外观检验_日期"},obj];
arrays[newArrayName3] = [{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj];
});
}else{
let obj = {};
obj.value =that.query.batch;
obj.field = "batch";
obj.compare = "contains";
arrays.arr1=[{field:"data__has_key",compare:"",value:"尺寸检验_日期"},obj];
arrays.arr2=[{field:"data__has_key",compare:"",value:"外观检验_日期"},obj];
arrays.arr3=[{field:"data__has_key",compare:"",value:"外观检验_返修_日期"},obj];
}
console.log('arrays',arrays);
for(let key in that.query){
if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined){
if(that.query[key] != ""&&that.query[key] != null&&that.query[key] != undefined&&key!='batch'){
let obj = {};
obj.value = that.query[key];
if(key=='batch'){
obj.field = "batch";
obj.compare = "contains";
}else if(key=='cc_data_start'){
if(key=='cc_data_start'){
obj.compare = "gte";
obj.field = "data__尺寸检验_日期";
}else if(key=='cc_data_end'){
}
if(key=='cc_data_end'){
obj.compare = "lte";
obj.field = "data__尺寸检验_日期";
}else if(key=='shiftcc'){
}
if(key=='shiftcc'){
obj.compare = "";
obj.field = "data__尺寸检验_班次";
}else if(key=='wg_data_start'){
}
if(key=='wg_data_start'){
obj.compare = "gte";
obj.field = "data__外观检验_日期";
}else if(key=='wg_data_end'){
}
if(key=='wg_data_end'){
obj.compare = "lte";
obj.field = "data__外观检验_日期";
}else if(key=='shiftwg'){
}
if(key=='shiftwg'){
obj.compare = "";
obj.field = "data__外观检验_班次";
}else if(key=='fx_data_start'){
}
if(key=='fx_data_start'){
obj.compare = "gte";
obj.field = "data__外观检验_返修_日期";
}else if(key=='fx_data_end'){
}
if(key=='fx_data_end'){
obj.compare = "lte";
obj.field = "data__外观检验_返修_日期";
}
arr1.push(obj);
arr2.push(obj);
arr3.push(obj);
if(that.query.batch.indexOf(' ')){
let arrs = that.query.batch.split(' ');
arrs.forEach((item,index)=>{
let newArrayName1 = 'arr1' + index;
let newArrayName2 = 'arr2' + index;
let newArrayName3 = 'arr3' + index;
arrays[newArrayName1].push(obj);
arrays[newArrayName2].push(obj);
arrays[newArrayName3].push(obj);
});
}else{
arrays.arr1.push(obj);
arrays.arr2.push(obj);
arrays.arr3.push(obj);
}
}
}
that.params.querys.push(arr1,arr2,arr3);
for(let key in arrays){
that.params.querys.push(arrays[key]);
}
this.getList();
},
getSummaries({ columns, data }) {

8
src/views/wpm_bx/mlogbw_check_table.vue
View File

@ -586,7 +586,7 @@ export default {
}
},
//添加
formTableSave(row) {
formTableSave(row,index) {
let that = this;
let editIndex = 0;
that.mlogbwlist.forEach((item,index) => {
@ -629,6 +629,12 @@ export default {
}else{
obj.ftest = null;
}
//当前工段为‘排一次棒’的时候，将batch改为number；
if(that.mgroupName=='排一次棒'){
that.$API.wpm.mlogb.patchOut.req(row.mlogb, { batch: row.number }).then((res) => {
that.mlogbwlist[index].mlogb__batch = row.number;
})
}
if(row.id!==''&&row.id!==undefined&&row.id!==null){
obj.id = row.id;
that.$API.wpm.mlogbw.update.req(row.id,obj).then((res) => {

35
src/views/wpm_gx/check_drawer.vue
View File

@ -54,17 +54,24 @@
</el-table-column>
<el-table-column label="检验人" prop="test_user_name">
</el-table-column>
<!-- <el-table-column label="操作" fixed="right" width="60">
<el-table-column label="操作" fixed="right" width="80">
<template #default="scope">
<el-button
link
type="primary"
type="warning"
v-if="scope.row.submit_time!==null"
v-auth="'ftestwork.update'"
@click="table_del(scope.row)"
>删除
</el-button>
@click="table_revert(scope.row)"
>撤回</el-button>
<el-button
link
v-if="scope.row.submit_time==null"
type="danger"
v-auth="'ftestwork.update'"
@click="table_delete(scope.row)"
>删除</el-button>
</template>
</el-table-column> -->
</el-table-column>
</scTable>
</el-main>
</el-container>
@ -97,11 +104,21 @@ export default {
this.apiObj = this.$API.qm.ftestwork.list;
return this;
},
table_del(row){
this.$API.qm.ftestwork.delete.req(row.id).then((res) => {
this.$refs.drawer_table.fetch();
table_revert(row){
this.$API.qm.ftestwork.revert.req(row.id).then((res) => {
this.$refs.drawer_table.refresh();
});
},
table_delete(row){
let that = this;
that.$confirm("确定删除该检验记录吗？", "提示", {
type: "warning",
}).then(() => {
that.$API.qm.ftestwork.delete.req(row.id).then((res) => {
that.$refs.drawer_table.refresh();
});
}).catch(() => {});
},
},
};
</script>

2
src/views/wpm_gx/mlogb_check.vue
View File

@ -386,6 +386,8 @@ export default {
that.visible = true;
that.mlogbItem = data;
that.form.batch = data.batch;
that.form.test_user = data.test_user;
that.form.test_user_name = data.test_user_name;
that.form.count_real =Number(data.count_real);
that.form.count_ok= Number(data.count_ok);
that.form.count_ok_full= Number(data.count_ok_full);