Skip to content

M
mes-ui
Commit bb5a45a2 authored by renjintao's avatar renjintao
Browse files
Options

Merge branch 'master' of git.mes123.com:zhouyx/mes-ui

parents 7cb58806 a0a11d46
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 97 deletions
pages/crm/sales/add.vue
View file @ bb5a45a2
......@@ -79,9 +79,9 @@
</Form>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: 'Add',
name: "Add",
data() {
return {
disabled: false,
......@@ -94,15 +94,15 @@ export default {
stage: 1
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
name: [{ required: true, message: "必填", trigger: "blur" }]
},
parms: {
app: 'Follow',
app: "Follow",
eid: null,
name: '',
field: ''
name: "",
field: ""
}
}
};
},
props: {
v: Object,
......@@ -113,67 +113,67 @@ export default {
}
},
mounted() {
this.parms.eid = this.$u.guid()
this.$refs.refFile.intFiles()
this.parms.eid = this.$u.guid();
this.$refs.refFile.intFiles();
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
this.$refs.form.validate(v => {
if (v) {
this.entity.accessory = ''
this.entity.accessory = "";
if (this.$refs.refFile.nameList.length > 0) {
let nameList = this.$refs.refFile.nameList
let names = []
nameList.forEach((e) => {
names.push(e.fileName)
})
let nameList = this.$refs.refFile.nameList;
let names = [];
nameList.forEach(e => {
names.push(e.fileName);
});
this.entity.accessory = JSON.stringify(names)
.replace('[', '')
.replace(']', '')
.replace(/\"/g, '') //附件本地库暂存文件名称
.replace("[", "")
.replace("]", "")
.replace(/\"/g, ""); //附件本地库暂存文件名称
}
this.disabled = true
this.disabled = true;
Api.create(this.entity)
.then((r) => {
this.disabled = false
.then(r => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
this.$Message.success("保存成功");
this.$emit("on-ok");
} else {
this.$Message.error('保存失败')
this.$Message.error("保存失败");
}
this.$refs.refFile.intFiles()
})
.catch((err) => {
this.disabled = false
this.$Message.error('保存失败')
console.warn(err)
this.$refs.refFile.intFiles();
})
.catch(err => {
this.disabled = false;
this.$Message.error("保存失败");
console.warn(err);
});
}
})
});
},
handleClose() {
this.$emit('on-close')
this.$emit("on-close");
},
l(key) {
key = 'Follow' + '.' + key
return this.$t(key)
key = "Follow" + "." + key;
return this.$t(key);
}
},
watch: {
'addId.projectId'(v) {
"addId.projectId"(v) {
if (v > 0) {
this.entity.projectId = v
this.entity.projectId = v;
}
},
'addId.customerId'(v) {
"addId.customerId"(v) {
if (v > 0) {
this.entity.customerId = v
this.entity.customerId = v;
}
},
'addId.principal'(v) {
this.entity.principal = v
"addId.principal"(v) {
this.entity.principal = v;
}
}
}
};
</script>
\ No newline at end of file
pages/crm/sales/projectList.vue
View file @ bb5a45a2
......@@ -290,6 +290,7 @@ export default {
},
watch: {
stage(v) {
this.isactive = null;
this.getList(v);
},
"easySearch.projectId.value"(v) {
......
pages/order/monitoring/index.vue
View file @ bb5a45a2
......@@ -385,7 +385,7 @@ export default {
params.row.status == 6 ? "Button" : "", //订单状态执行中，暂停
{
props: {
type: "default",
type: "success",
size: "small",
icon: "ios-pause",
ghost: true
......
pages/order/monitoring/speed.vue
View file @ bb5a45a2
......@@ -4,125 +4,125 @@
</div>
</template>
<script>
import Api from './api'
import Api from "./api";
export default {
name: '',
name: "",
data() {
return {
columns: [
{
key: 'detailId',
title: this.l('detailId'),
align: 'left'
key: "detailId",
title: this.l("detailId"),
align: "center"
},
{
key: 'taskSeq',
title: this.l('taskSeq'),
align: 'left'
key: "taskSeq",
title: this.l("taskSeq"),
align: "center"
},
{
key: 'detailName',
title: this.l('detailName'),
align: 'left'
key: "detailName",
title: this.l("detailName"),
align: "left"
},
{
key: 'routingCode',
title: this.l('routingCode'),
align: 'left'
key: "routingCode",
title: this.l("routingCode"),
align: "center"
},
{
key: 'userNames',
title: this.l('userNames'),
key: "userNames",
title: this.l("userNames"),
align: 'left'
align: "center"
},
{
key: 'demandStartDate',
title: this.l('demandStartDate'),
align: 'center',
key: "demandStartDate",
title: this.l("demandStartDate"),
align: "center",
render: (h, params) => {
return h(
'span',
this.sliceStr(params.row.demandStartDate + ' ', 0, 10),
"span",
this.sliceStr(params.row.demandStartDate + " ", 0, 10),
params.row.demandStartDate
)
);
}
},
{
key: 'demandFinishDate',
title: this.l('demandFinishDate'),
align: 'center',
key: "demandFinishDate",
title: this.l("demandFinishDate"),
align: "center",
render: (h, params) => {
return h(
'span',
this.sliceStr(params.row.demandFinishDate + ' ', 0, 10),
"span",
this.sliceStr(params.row.demandFinishDate + " ", 0, 10),
params.row.demandFinishDate
)
);
}
},
{
key: 'actualStartDate',
title: this.l('actualStartDate'),
align: 'center',
key: "actualStartDate",
title: this.l("actualStartDate"),
align: "center",
render: (h, params) => {
return h(
'span',
"span",
// this.sliceStr(params.row.actualStartDate + ' ', 0, 10),
params.row.actualStartDate == '0001-01-01 00:00:00'
? ''
params.row.actualStartDate == "0001-01-01 00:00:00"
? ""
: params.row.actualStartDate
)
);
}
},
{
key: 'actualFinishDate',
title: this.l('actualFinishDate'),
align: 'center',
key: "actualFinishDate",
title: this.l("actualFinishDate"),
align: "center",
render: (h, params) => {
return h(
'span',
"span",
// this.sliceStr(params.row.actualFinishDate + ' ', 0, 10),
params.row.actualFinishDate == '0001-01-01 00:00:00'
? ''
params.row.actualFinishDate == "0001-01-01 00:00:00"
? ""
: params.row.actualFinishDate
)
);
}
},
{
key: 'status',
type: 'user',
title: this.l('status'),
code: 'plan.order.status',
align: 'left'
key: "status",
type: "user",
title: this.l("status"),
code: "plan.order.status",
align: "center"
}
]
}
};
},
props: {
result: Array
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
await store.dispatch("loadDictionary"); // 加载数据字典
},
created() {},
methods: {
//截取字符串
sliceStr(str, lenS, lenE) {
return str.slice(lenS, lenE)
return str.slice(lenS, lenE);
},
l(key) {
let vkey = 'mes_order_watch' + '.' + key
return this.$t(vkey) || key
let vkey = "mes_order_watch" + "." + key;
return this.$t(vkey) || key;
}
}
}
};
</script>
<style lang='less'>
</style>
\ No newline at end of file
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