diff --git a/conf/config.js b/conf/config.js
index 378ddc7..9052a00 100644
--- a/conf/config.js
+++ b/conf/config.js
@@ -17,12 +17,12 @@ let baseUrl = '/';
// 腾讯地图Key, h5使用
let QQMapKey = '';
-let commonBaseUrl= 'https://www.shuimuwy.com/';
+let commonBaseUrl= 'https://shuimuwy.com/';
// #ifndef H5
//服务器域名 小程序 或者 app 时 后端地址
//let baseUrl = 'http://demo.homecommunity.cn/';
-let baseUrl = 'https://www.shuimuwy.com/';
+let baseUrl = 'https://shuimuwy.com/';
// #endif
//app支付时这里需要填写支付秘钥
diff --git a/manifest.json b/manifest.json
index eee2ef9..1b24f39 100644
--- a/manifest.json
+++ b/manifest.json
@@ -59,7 +59,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx0a08dd8124d7f04f",
+ "appid" : "wxaba59a870ae03d54",
"setting" : {
"urlCheck" : false
},
diff --git a/pages/newOaWorkflowForm/newOaWorkflowForm.vue b/pages/newOaWorkflowForm/newOaWorkflowForm.vue
index 9fa4fde..a736027 100644
--- a/pages/newOaWorkflowForm/newOaWorkflowForm.vue
+++ b/pages/newOaWorkflowForm/newOaWorkflowForm.vue
@@ -52,7 +52,7 @@
- {{item.values.length==0 ? "请选择" : item.values[item.valueIndex].label}}
+ {{item.valueIndex <0 ? "请选择" : item.values[item.valueIndex].label}}
@@ -132,9 +132,12 @@
if (item.type == 'textdate' || item.type == 'textdatetime') {
item.value = "请选择";
}
- if (item.type == "radio" || item.type == "select") {
+ if (item.type == "radio") {
item.valueIndex = 0;
}
+ if ( item.type == "select") {
+ item.valueIndex = -1;
+ }
})
})
},
diff --git a/pages/work/doCopyWork.vue b/pages/work/doCopyWork.vue
index 8d1f807..b8eece2 100644
--- a/pages/work/doCopyWork.vue
+++ b/pages/work/doCopyWork.vue
@@ -15,6 +15,7 @@
+ 未办理
已处理
@@ -34,6 +35,14 @@
+
+ 评分
+
+
+ {{ score }}分
+
+
+
扣款金额
@@ -68,6 +77,8 @@
createUserName: '',
items: [],
deductionMoney: 0,
+ scores: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+ score: 10,
item: {
staffName: '',
remark: '',
@@ -110,6 +121,7 @@
deductionReason: this.deductionReason,
itemId: this.itemId,
deductionMoney: this.deductionMoney,
+ score:this.score,
}).then(_data => {
uni.navigateBack();
})
@@ -123,10 +135,17 @@
}
})
},
+ onNumberChange(e) {
+ const index = e.detail.value;
+ this.score = this.scores[index];
+ }
}
}
\ No newline at end of file
diff --git a/pages/work/doWorkAudit.vue b/pages/work/doWorkAudit.vue
index ad3aa39..24a9563 100644
--- a/pages/work/doWorkAudit.vue
+++ b/pages/work/doWorkAudit.vue
@@ -191,6 +191,10 @@
.centent-btn {
font-size: 22px;
}
+ .title{
+ min-height: 60upx;
+ height: auto;
+ }
.file-size {
font-size: 48upx;