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

styleAdjust

This commit is contained in:
shijing 2022-02-18 15:05:02 +08:00
parent 2c4f82d393
commit 76f6def36f
6 changed files with 606 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
hb_client/src/views/inm/product.vue
View File

@ -24,25 +24,18 @@
<el-table-column label="成品批次">
<template slot-scope="scope">{{ scope.row.batch }}</template>
</el-table-column>
<el-table-column label="成品名称">
<el-table-column label="成品名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="所在仓库">
<template slot-scope="scope">{{
scope.row.warehouse_.name
}}</template>
<template slot-scope="scope">{{scope.row.warehouse_.name}}</template>
</el-table-column>
<el-table-column label="订单">
<template slot-scope="scope">
<span v-if="scope.row.to_order_">{{
scope.row.to_order_.number
}}</span>
<span v-if="scope.row.to_order_">{{scope.row.to_order_.number}}</span>
<el-tag
v-else-if="
scope.row.to_order_ == null && scope.row.need_to_order == true
"
v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
>
需要确定订单
</el-tag>
@ -51,13 +44,9 @@
</el-table-column>
<el-table-column label="合同">
<template slot-scope="scope">
<span v-if="scope.row.to_order_">{{
scope.row.to_order_.contract_.name
}}</span>
<span v-if="scope.row.to_order_">{{scope.row.to_order_.contract_.name}}</span>
<span
v-else-if="
scope.row.to_order_ == null && scope.row.need_to_order == true
"
v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
>
</span>
<span v-else></span>
@ -65,25 +54,20 @@
</el-table-column>
<el-table-column label="客户">
<template slot-scope="scope">
<span v-if="scope.row.to_order_">{{
scope.row.to_order_.customer_.name
}}</span>
<span v-if="scope.row.to_order_">{{scope.row.to_order_.customer_.name}}</span>
<span
v-else-if="
scope.row.to_order_ == null && scope.row.need_to_order == true
"
v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true"
>
</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column label="军检">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_mtestok == false">不合格</el-tag>
<el-tag v-else-if="scope.row.is_mtestok == true">合格</el-tag>
<span v-else></span
></template>
<span v-else></span>
</template>
</el-table-column>
<!-- <el-table-column align="center" label="操作" width="220px">
<template slot-scope="scope">
@ -112,8 +96,8 @@
</el-form-item>
<el-form-item label="军检备注" prop="name">
<el-input
type="textarea"
v-model="mtestform.remark_mtest"
type="textarea"
></el-input>
</el-form-item>
</el-form>
@ -132,7 +116,6 @@
<el-descriptions-item label="原客户">{{ this.customershow }}</el-descriptions-item>
<el-descriptions-item label="原合同">{{ this.contractshow }}</el-descriptions-item>
</el-descriptions>
<el-table
v-loading="listLoading"
:data="orderList"
@ -144,19 +127,16 @@
v-el-height-adaptive-table="{ bottomOffset: 42 }"
>
<el-table-column type="index" width="50"/>
<el-table-column label="订单编号" width="160" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="客户" width="200" show-overflow-tooltip>
<template slot-scope="scope">{{
scope.row.customer_.name
}}</template>
<template slot-scope="scope">{{scope.row.customer_.name}}
</template>
</el-table-column>
<el-table-column label="所属合同" width="200" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.contract">{{
scope.row.contract_.name
}}</template>
<template slot-scope="scope" v-if="scope.row.contract">{{scope.row.contract_.name}}
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="120">
<template slot-scope="scope">
@ -168,7 +148,6 @@
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisibleorder = false">取 消</el-button>
</div>

54
hb_client/src/views/mtm/materialdo.vue
View File

@ -79,26 +79,13 @@
<el-form-item label="表格名称" prop="name">
<el-input v-model="recordform.name" placeholder="表格名称"/>
</el-form-item>
<!--<el-form-item label="引用表单" prop="field_type">
<el-select
style="width: 100%"
v-model="recordform.number"
placeholder="请选择"
>
<el-option
v-for="item in fieldtypeoptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>-->
<el-form-item label="表格类型" prop="formUsed">
<el-select
style="width: 100%"
v-model="recordform.type"
clearable
style="width: 100%"
placeholder="请选择"
@change="formTypeChange"
>
<el-option
v-for="item in typeOptions"
@ -109,6 +96,22 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="引用表单" prop="field_type">
<el-select
v-model="recordform.form"
style="width: 100%"
clearable
placeholder="请选择"
>
<el-option
v-for="item in formList"
:key="item.id"
:label="item.name"
:value="item.id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="name">
<el-switch v-model="recordform.enabled"></el-switch>
</el-form-item>
@ -576,6 +579,7 @@
recordformList: {
count: 0,
},
formList:[],
fieldList: {
count: 0,
},
@ -696,6 +700,13 @@
this.material = this.$route.params.id;
this.recordformLists();
},
mounted(){
getrecordformList({page:0}).then((response) => {
if (response.data) {
this.formList = response.data;
}
});
},
methods: {
formFunc(value) {
this.dialogVisibleForm = value;
@ -882,6 +893,13 @@
// this.$refs["Forms"].resetFields();
// });
},
formTypeChange(){
getrecordformList({type:this.recordform.type,page:0}).then((response) => {
if (response.data) {
this.formList = response.data;
}
});
},
//新增字段
handlefieldCreate() {
this.field_choice = [""];
@ -903,6 +921,8 @@
});
},
handleEdit(scope) {
debugger;
console.log( scope.row);
this.recordform = Object.assign({}, scope.row); // copy obj
this.dialogType = "edit";
this.dialogVisible = true;
@ -959,6 +979,7 @@
obj.type=this.recordform.type;
obj.enabled=this.recordform.enabled;
if (isEdit) {
obj.form=this.recordform.form?this.recordform.form:null;
updaterecordform(this.recordform.id, obj).then(
(res) => {
if (res.code >= 200) {
@ -970,6 +991,7 @@
);
} else {
obj.material=parseInt(this.material);
obj.form=this.recordform.form!==''?this.recordform.form:null;
createrecordform(obj).then((res) => {
if (res.code >= 200) {
this.recordformLists();

28
hb_client/src/views/procurement/vendor.vue
View File

@ -2,10 +2,9 @@
<div class="app-container">
<el-card>
<div>
<el-button type="primary" icon="el-icon-plus" @click="handleCreate"
>新增供应商</el-button >
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">
新增供应商
</el-button>
<el-input
v-model="listQuery.search"
placeholder="供应商名称"
@ -18,17 +17,18 @@
type="primary"
icon="el-icon-search"
@click="handleFilter"
>搜索</el-button
>
搜索
</el-button>
<el-button
class="filter-item"
type="primary"
icon="el-icon-refresh-left"
@click="resetFilter"
>重置</el-button
>
重置
</el-button>
</div>
</el-card>
<el-card style="margin-top: 2px">
<el-table
@ -53,17 +53,16 @@
<el-table-column label="联系电话">
<template slot-scope="scope">{{ scope.row.contact_phone }}</template>
</el-table-column>
<el-table-column label="地址">
<el-table-column label="地址" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.address }}</template>
</el-table-column>
<el-table-column label="供应物料">
<template slot-scope="scope">{{ scope.row.material }}</template>
</el-table-column>
<el-table-column label="备注">
<template slot-scope="scope">{{ scope.row.description }}</template>
</el-table-column>
<el-table-column label="创建时间">
<el-table-column label="创建时间" width="160">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
<el-table-column
@ -72,19 +71,20 @@
width="220px"
>
<template slot-scope="scope">
<el-link
v-if="checkPermission(['vendor_update'])"
type="primary"
@click="handleEdit(scope)"
>编辑</el-link
>
编辑
</el-link>
<el-link
v-if="checkPermission(['vendor_delete'])"
type="danger"
@click="handleDelete(scope)"
>删除</el-link
>
删除
</el-link>
</template>
</el-table-column>
</el-table>
@ -116,14 +116,12 @@
<el-form-item label="联系电话" prop="contact_phone">
<el-input v-model="vendor.contact_phone" placeholder="联系电话"/>
</el-form-item>
<el-form-item label="地址" prop="address">
<el-input v-model="vendor.address" placeholder="地址"/>
</el-form-item>
<el-form-item label="供应物料" prop="material">
<el-input v-model="vendor.material" placeholder="供应物料"/>
</el-form-item>
<el-form-item label="备注" prop="description">
<el-input
type="textarea"

105
hb_client/src/views/qm/processtest.vue
View File

@ -15,56 +15,56 @@
<el-table-column label="任务编号" align="center">
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="产品名称" align="center">
<el-table-column label="产品名称" align="center" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.product_.name }}</template>
</el-table-column>
<el-table-column label="规格型号" align="center">
<template slot-scope="scope">{{
scope.row.product_.specification
}}</template>
<template slot-scope="scope">
{{scope.row.product_.specification }}
</template>
</el-table-column>
<el-table-column label="合格率" align="center">
<el-table-column label="冷加工" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['01']"
>{{ scope.row.process_json["01"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['01']">
{{ scope.row.process_json["01"].rate }}%
</template>
</el-table-column>
<el-table-column label="热弯" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['02']"
>{{ scope.row.process_json["02"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['02']">
{{ scope.row.process_json["02"].rate }}%
</template>
</el-table-column>
<el-table-column label="化学钢化" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['03']"
>{{ scope.row.process_json["03"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['03']">
{{ scope.row.process_json["03"].rate }}%
</template>
</el-table-column>
<el-table-column label="镀膜" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['05']"
>{{ scope.row.process_json["05"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['05']">
{{ scope.row.process_json["05"].rate }}%
</template>
</el-table-column>
<el-table-column label="夹层" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['06']"
>{{ scope.row.process_json["06"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['06']">
{{ scope.row.process_json["06"].rate }}%
</template>
</el-table-column>
<el-table-column label="包边" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['07']"
>{{ scope.row.process_json["07"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['07']">
{{ scope.row.process_json["07"].rate }}%
</template>
</el-table-column>
<el-table-column label="装框" align="center">
<template slot-scope="scope" v-if="scope.row.process_json['08']"
>{{ scope.row.process_json["08"].rate }}%</template
>
<template slot-scope="scope" v-if="scope.row.process_json['08']">
{{ scope.row.process_json["08"].rate }}%
</template>
</el-table-column>
</el-table-column>
<el-table-column label="创建时间" align="center">
<template slot-scope="scope">{{
scope.row.create_time
}}</template>
<el-table-column label="创建时间" align="center" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.create_time }}
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
@ -72,8 +72,9 @@
v-if="checkPermission(['material_update'])"
type="primary"
@click="handledetail(scope)"
>详情</el-link
>
详情
</el-link>
</template>
</el-table-column>
</el-table>
@ -100,34 +101,34 @@
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="订单编号">
<template slot-scope="scope" v-if="scope.row.order_">{{
scope.row.order_.number
}}</template>
<template slot-scope="scope" v-if="scope.row.order_">
{{scope.row.order_.number}}
</template>
</el-table-column>
<el-table-column label="产品名称">
<template slot-scope="scope" v-if="scope.row.product_">{{
scope.row.product_.name
}}</template>
<el-table-column label="产品名称" min-width="110" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.product_">
{{scope.row.product_.name}}
</template>
</el-table-column>
<el-table-column label="规格型号">
<template slot-scope="scope" v-if="scope.row.product_">{{
scope.row.product_.specification
}}</template>
<template slot-scope="scope" v-if="scope.row.product_">
{{scope.row.product_.specification}}
</template>
</el-table-column>
<el-table-column label="责任工序">
<template slot-scope="scope" v-if="scope.row.resp_process_">{{
scope.row.resp_process_.name
}}</template>
<template slot-scope="scope" v-if="scope.row.resp_process_">
{{scope.row.resp_process_.name}}
</template>
</el-table-column>
<el-table-column label="处理结果">
<template slot-scope="scope">{{
decision_[scope.row.decision]
}}</template>
<template slot-scope="scope">
{{decision_[scope.row.decision]}}
</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{
scope.row.create_time
}}</template>
<el-table-column label="创建时间" min-width="150" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.create_time}}
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
@ -135,8 +136,9 @@
v-if="checkPermission(['material_update'])"
type="primary"
@click="handledetailbhg(scope)"
>查看</el-link
>
查看
</el-link>
</template>
</el-table-column>
</el-table>
@ -147,7 +149,6 @@
:limit.sync="listQuery2.page_size"
@pagination="getList2"
/>
</el-tab-pane>
</el-tabs>
</el-card>

2
hb_client/src/views/qm/producttest.vue
View File

@ -17,7 +17,7 @@
<template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}
</template>
</el-table-column>
<el-table-column label="产品名称">
<el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="型号规格">

54
hb_client/src/views/qm/unproduct.vue
View File

@ -16,16 +16,16 @@
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="任务编号">
<template slot-scope="scope" v-if="scope.row.subproduction_plan_">{{ scope.row.subproduction_plan_.number }}
<template slot-scope="scope" v-if="scope.row.subproduction_plan_">
{{ scope.row.subproduction_plan_.number}}
</template>
</el-table-column>
<el-table-column label="产品名称">
<el-table-column label="产品名称" min-width="100" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.name }}</template>
</el-table-column>
<el-table-column label="型号规格">
<template slot-scope="scope" v-if="scope.row.material_">{{ scope.row.material_.specification }}</template>
</el-table-column>
<el-table-column label="军检结论">
<template slot-scope="scope">
<el-tag v-if="scope.row.is_mtestok==false">不合格</el-tag>
@ -78,34 +78,34 @@
<template slot-scope="scope">{{ scope.row.number }}</template>
</el-table-column>
<el-table-column label="订单编号">
<template slot-scope="scope" v-if="scope.row.order_">{{
scope.row.order_.number
}}</template>
<template slot-scope="scope" v-if="scope.row.order_">
{{scope.row.order_.number}}
</template>
</el-table-column>
<el-table-column label="产品名称">
<template slot-scope="scope" v-if="scope.row.product_">{{
scope.row.product_.name
}}</template>
<el-table-column label="产品名称" min-width="120" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.product_">
{{scope.row.product_.name}}
</template>
</el-table-column>
<el-table-column label="规格型号">
<template slot-scope="scope" v-if="scope.row.product_">{{
scope.row.product_.specification
}}</template>
<template slot-scope="scope" v-if="scope.row.product_">
{{scope.row.product_.specification}}
</template>
</el-table-column>
<el-table-column label="责任工序">
<template slot-scope="scope" v-if="scope.row.resp_process_">{{
scope.row.resp_process_.name
}}</template>
<template slot-scope="scope" v-if="scope.row.resp_process_">
{{scope.row.resp_process_.name}}
</template>
</el-table-column>
<el-table-column label="处理结果">
<template slot-scope="scope">{{
decision_[scope.row.decision]
}}</template>
<template slot-scope="scope">
{{decision_[scope.row.decision]}}
</template>
</el-table-column>
<el-table-column label="创建时间">
<template slot-scope="scope">{{
scope.row.create_time
}}</template>
<template slot-scope="scope">
{{scope.row.create_time}}
</template>
</el-table-column>
<el-table-column label="操作">
<template slot-scope="scope">
@ -113,8 +113,9 @@
v-if="checkPermission(['material_update'])"
type="primary"
@click="handledetailbhg(scope)"
>查看</el-link
>
查看
</el-link>
</template>
</el-table-column>
</el-table>
@ -125,7 +126,6 @@
:limit.sync="listQuery2.page_size"
@pagination="getList2"
/>
</el-tab-pane>
<el-tab-pane label="入厂不合格" name="4">
<el-table
@ -148,7 +148,8 @@
<el-table-column label="规格型号">
<template slot-scope="scope">{{
scope.row.material_.specification
}}</template>
}}
</template>
</el-table-column>
<el-table-column label="物料单位">
<template slot-scope="scope">{{ scope.row.material_.unit }}</template>
@ -265,8 +266,7 @@ export default {
});
},
//不合格玻璃审理单查看
handledetailbhg(scope)
{
handledetailbhg(scope) {
this.$router.push({name: "ticketDetail", params: {ticketId: scope.row.ticket}})
},