diff --git a/files-settings.yaml b/files-settings.yaml
index c0e3014..7342237 100644
--- a/files-settings.yaml
+++ b/files-settings.yaml
@@ -131,7 +131,7 @@ RabbitMQPass: ${RABBITMQ_PASSWORD} # rabbitmq 密码
MongoDBServer: "${MONGODB_SERVER}" # mongodb ENV环境变量,一般不做修改,如果要修改,可以修改MongoDB-Server-Dev 和 MongoDB-Server-Prod的两个值
MongoDBPort: ${MONGODB_PORT}
MongoDBUser: ${MONGODB_USER} # mongodb 用户名
-MongoDBPass: ${MONGODB_PASS} # mongodb 密码
+MongoDBPass: ${MONGODB_PASSWORD} # mongodb 密码
BeanstalkdServer: "${BEANSTALKD_SERVER}" # beanstalkd ENV环境变量,一般不做修改,如果要修改,可以修改Beanstalkd-Server-Dev 和 Beanstalkd-Server-Prod的两个值
BeanstalkdPort: ${BEANSTALKD_PORT}
@@ -297,7 +297,7 @@ EtcdPortLocal: "2379"
MySQLServerLocal: 127.0.0.1
MySQLPortLocal: "3306"
MySQLUserLocal: root
-MySQLPasswordLocal: "123456"
+MySQLPasswordLocal: "zxcvb147852~!"
RedisServerLocal: 127.0.0.1
RedisPortLocal: "6379"
RedisPassLocal: ""
@@ -305,7 +305,7 @@ RedisTypeLocal: node
MongoDBServerLocal: 127.0.0.1
MongoDBPortLocal: "27017"
MongoDBUserLocal: root
-MongoDBPassLocal: ""
+MongoDBPassLocal: "zxcvb147852"
BeanstalkdServerLocal: 127.0.0.1
BeanstalkdPortLocal: "11300"
BeanstalkdRedisServerLocal: 127.0.0.1 # beanstalkd redis ENV环境变量,一般不做修改,如果要修改,可以修改Beanstalkd-Redis-Server-Dev 和 Beanstalkd-Redis-Server-Prod的两个值
diff --git a/src/application/mk/index.js b/src/application/mk/index.js
index cbc66c4..1c6a2c8 100644
--- a/src/application/mk/index.js
+++ b/src/application/mk/index.js
@@ -163,6 +163,12 @@ VXETable.formats.mixin({
if (!cellValue) return '';
return parseFloat(cellValue).toFixed(2) + "%";
},
+
+ formatProduction({ cellValue }) { // 百分比的形式显示
+ if (cellValue === 0) return '未布产';
+ if (!cellValue) return '';
+ return '已布产';
+ },
})
VXETable.renderer.add('enum', {
diff --git a/src/pages/Middle/Mold/MoldOrder/selector.vue b/src/pages/Middle/Mold/MoldOrder/selector.vue
index ca2e639..6039191 100644
--- a/src/pages/Middle/Mold/MoldOrder/selector.vue
+++ b/src/pages/Middle/Mold/MoldOrder/selector.vue
@@ -13,6 +13,7 @@
+
@@ -299,7 +300,15 @@ export default {
onSearch() {
this.$refs.xGrid.commitProxy('query')
+ },
+ production({ cellValue }) {
+ if (cellValue === 0){
+ return cellValue;
+ }else{
+ return cellValue;
+ }
}
+
},
// 监听属性
watch: {
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/List.vue b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
index 31598d3..ff2adbe 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/List.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/List.vue
@@ -117,6 +117,7 @@ export default {
searchRules: [
{ key: "code", mode: "like" },
{ key: "mold_master_uid", mode: "=" },
+ { key: "is_complete", mode: "=" },
{ key: "engineer_uid", mode: "=" }
],
//搜索区
@@ -125,6 +126,7 @@ export default {
{ field: 'code', title: '编码', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入编码' } } },
{ field: 'customer_name', title: '客户名称', span: 4, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
+ { field: 'is_complete', title: '完成状态', span: 2, itemRender: { name: '$input', props: { placeholder: '请输入客户名称' } } },
{
title: '模具师傅', span:4,
field: 'mold_master_uid',