Skip to content

M
mes-ui
Commit 788836a2 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

parents e6203135 963b2aa4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1320 additions and 1372 deletions
components/page/userSelect.vue
View file @ 788836a2
This diff is collapsed.
pages/handle/examine1/detail.vue
View file @ 788836a2
<template> <template>
<div class="detail table-detail"> <div class="detail table-detail">
<Row> <Row>
<Filed :span="6" :name="l('productName')">{{entity.productName}}</Filed> <Filed :span="6" :name="l('productName')">{{entity.productName}}</Filed>
<Filed :span="6" :name="l('mesCode')">{{entity.mesCode}}</Filed> <Filed :span="6" :name="l('mesCode')">{{entity.mesCode}}</Filed>
<Filed :span="6" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed> <Filed :span="6" :name="l('drawnNumber')">{{entity.drawnNumber}}</Filed>
<Filed :span="6" :name="l('stage')"><state code="plan.order.stage" :value="entity.stage+''" type="text"></state></Filed> <Filed :span="6" :name="l('stage')" v-if="false">
<Filed :span="6" :name="l('taskType')"><state code="plan.order.taskType" :value="entity.taskType+''" type="text"></state></Filed> <state code="plan.order.stage" :value="entity.stage+''" type="text"></state>
<Filed :span="6" :name="l('quantity')">{{entity.quantity}}</Filed> </Filed>
<Filed :span="6" :name="l('materialId')"><state code="plan.order.material" :value="entity.materialId+''" type="text"></state></Filed> <Filed :span="6" :name="l('taskType')">
<Filed :span="6" :name="l('routing_Method')"><state code="plan.order.routingMethod" :value="entity.routing_Method+''" type="text"></state></Filed> <state code="plan.order.taskType" :value="entity.taskType+''" type="text"></state>
<Filed :span="6" :name="l('outer_Envelope_Size')">{{entity.outer_Envelope_Size}}</Filed> </Filed>
<Filed :span="6" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed> <Filed :span="6" :name="l('quantity')">{{entity.quantity}}</Filed>
<Filed :span="6" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed> <Filed :span="6" :name="l('materialId')" v-if="false">
<Filed :span="6" :name="l('printSupply')"><state code="plan.order.printSupply" :value="entity.printSupply+''" type="text"></state></Filed> <state code="plan.order.material" :value="entity.materialId+''" type="text"></state>
<Filed :span="6" :name="l('guestName')"><state code="plan.order.guestName" :value="entity.guestName+''" type="text"></state></Filed> </Filed>
<Filed :span="6" :name="l('routing_Method')" v-if="false">
<state code="plan.order.routingMethod" :value="entity.routing_Method+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('outer_Envelope_Size')" v-if="false">{{entity.outer_Envelope_Size}}</Filed>
<Filed :span="6" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
<Filed :span="6" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed>
<Filed :span="6" :name="l('printSupply')" v-if="false">
<state code="plan.order.printSupply" :value="entity.printSupply+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('guestName')" v-if="false">
<state code="plan.order.guestName" :value="entity.guestName+''" type="text"></state>
</Filed>
<Filed :span="6" :name="l('functionaryOffice')">{{entity.functionaryOffice}}</Filed> <Filed :span="6" :name="l('functionaryOffice')" v-if="false">{{entity.functionaryOffice}}</Filed>
<Filed :span="6" :name="l('taskRequire')">{{entity.taskRequire}}</Filed> <Filed :span="6" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
<Filed :span="6" :name="l('taskInputDate')">{{entity.taskInputDate}}</Filed> <Filed :span="6" :name="l('taskInputDate')" v-if="false">{{entity.taskInputDate}}</Filed>
<Filed :span="6" :name="l('mainDepartmentId')"><state code="plan.order.mainDepartment" :value="entity.mainDepartmentId+''" type="text"></state></Filed> <Filed :span="6" :name="l('mainDepartmentId')" v-if="false">
<Filed :span="6" :name="l('technologyDocmentCode')">{{entity.technologyDocmentCode}}</Filed> <state code="plan.order.mainDepartment" :value="entity.mainDepartmentId+''" type="text"></state>
<Filed :span="6" :name="l('putintDocmentCode')">{{entity.putintDocmentCode}}</Filed> </Filed>
<Filed :span="6" :name="l('outerDrawnNumber')">{{entity.outerDrawnNumber}}</Filed> <Filed :span="6" :name="l('technologyDocmentCode')" v-if="false">{{entity.technologyDocmentCode}}</Filed>
<Filed :span="6" :name="l('modelVersion')">{{entity.modelVersion}}</Filed> <Filed :span="6" :name="l('putintDocmentCode')" v-if="false">{{entity.putintDocmentCode}}</Filed>
<Filed :span="6" :name="l('designer')">{{entity.designer}}</Filed> <Filed :span="6" :name="l('outerDrawnNumber')" v-if="false">{{entity.outerDrawnNumber}}</Filed>
<Filed :span="6" :name="l('taskCode')">{{entity.taskCode}}</Filed> <Filed :span="6" :name="l('modelVersion')" v-if="false">{{entity.modelVersion}}</Filed>
<Filed :span="6" :name="l('mainRoutingPeople')">{{entity.mainRoutingPeople}}</Filed> <Filed :span="6" :name="l('designer')" v-if="false">{{entity.designer}}</Filed>
<Filed :span="6" :name="l('officeFunctionary')">{{entity.officeFunctionary}}v</Filed> <Filed :span="6" :name="l('taskCode')" v-if="false">{{entity.taskCode}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed> <Filed :span="6" :name="l('mainRoutingPeople')" v-if="false">{{entity.mainRoutingPeople}}</Filed>
<Filed :span="6" :name="l('officeFunctionary')" v-if="false">{{entity.officeFunctionary}}v</Filed>
<Filed :span="6" :name="l('projectNumber')">{{entity.projectNumber}}</Filed>
<Filed :span="6" :name="l('batchNumber')">{{entity.batchNumber}}</Filed>
<Filed :span="6" :name="l('urgencyLevel')">
<state code="plan.order.urgencyLevel" :value="entity.urgencyLevel+''" type="text"></state>
</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
</Row> </Row>
</div> </div>
</template> </template>
<script> <script>
import Api from '../api' import Api from '../api'
export default { export default {
name: 'detail', name: 'detail',
components: { components: {},
}, props: {
props: { idVal: {
idVal: { type: String,
type: String, default: ''
default: '' }
} },
}, async fetch({
async fetch({ store, params }) { store,
await store.dispatch('loadDictionary') // 加载数据字典 params
}, }) {
data() { await store.dispatch('loadDictionary') // 加载数据字典
return { },
entity: { data() {
state:'', return {
}, entity: {
} state: '',
}, },
created() { }
this.dataImmut = [] },
this.dataMut = [] created() {
this.dataImmut = []
this.dataMut = []
Api.get({
Id: this.idVal
}).then((r) => {
if (r.success) {
let formStr = r.result.formData.replace(/\"/g, '"')
this.entity = JSON.parse(formStr)[0]
Api.get({ Id: this.idVal }).then((r) => { } else {
if (r.success) { this.$Message.error('加载失败')
let formStr=r.result.formData.replace(/\"/g, '"') }
this.entity = JSON.parse(formStr)[0] })
},
} else { methods: {
this.$Message.error('加载失败') load(v) {},
} l(key) {
}) key = 'orderInfo' + '.' + key
}, return this.$t(key)
methods: { }
load(v) {}, },
l(key) { watch: {}
key = 'orderInfo' + '.' + key
return this.$t(key)
}
},
watch: {}
} }
</script> </script>
\ No newline at end of file
pages/handle/index.vue
View file @ 788836a2
This diff is collapsed.
pages/mesPlan/index.vue
View file @ 788836a2
...@@ -697,6 +697,7 @@ export default { ...@@ -697,6 +697,7 @@ export default {
if (res.success) { if (res.success) {
this.$Message.success("订单送审成功!"); this.$Message.success("订单送审成功!");
this.$refs.grid.load(); this.$refs.grid.load();
this.sendViewModal = false;
} else { } else {
this.$Message.error("订单送审失败!"); this.$Message.error("订单送审失败!");
} }
......
pages/resource/resource/index.vue
View file @ 788836a2
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment