educode_sales 0.9.79 → 0.9.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 395f66b5ef943bc9225deabd8c08878c41fc4c557107f1728c97e4db077950d0
|
4
|
+
data.tar.gz: c359c0122a4889fb641d8a7ced439aec7e2110db21edae0944cb33fc82b95fb3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 62eb2a7d7487db2adf78a544af31aae449c76026f5d29fd366a56b6ad96a25c47d3adcc3c30a1a9cc7ec0b9a53a9cca82ee5f9241ee5555d575c8bab1ac2b183
|
7
|
+
data.tar.gz: 9fe50dbd0b57e981e65976cef26a2ed96f69b09aa07df4c6ce15e6e97bf02caf23e960eb922266b32d32cde40cfdaa60795702cbdf2db8b96f1e337825a16087
|
@@ -233,6 +233,15 @@ module EducodeSales
|
|
233
233
|
@business = Business.find(params[:id])
|
234
234
|
@last_follow_up = @business.last_follow_up
|
235
235
|
@deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
|
236
|
+
signed_department = @last_follow_up.signed_department
|
237
|
+
if signed_department
|
238
|
+
gon.department = {value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}
|
239
|
+
gon.value = signed_department.id
|
240
|
+
else
|
241
|
+
gon.department = {}
|
242
|
+
gon.value = ''
|
243
|
+
end
|
244
|
+
|
236
245
|
render layout: false
|
237
246
|
end
|
238
247
|
|
@@ -103,20 +103,20 @@
|
|
103
103
|
<div class="layui-inline">
|
104
104
|
<label class="layui-form-label">计划签单时间:</label>
|
105
105
|
<div class="layui-input-inline" style="line-height: 38px;">
|
106
|
-
<input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off">
|
106
|
+
<input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off" value="<%= @last_follow_up&.plan_signed_date %>">
|
107
107
|
</div>
|
108
108
|
</div>
|
109
109
|
<div class="layui-inline">
|
110
110
|
<label class="layui-form-label" style="width:100px;">中标后:</label>
|
111
111
|
<div class="layui-input-inline" style="line-height: 38px;width:60px;">
|
112
|
-
<input type="text" class="layui-input" name="bidded_days" autocomplete="off">
|
112
|
+
<input type="text" class="layui-input" name="bidded_days" autocomplete="off" value="<%= @last_follow_up&.bidded_days %>">
|
113
113
|
</div>
|
114
114
|
<div class="layui-form-mid layui-word-aux">天</div>
|
115
115
|
</div>
|
116
116
|
<div class="layui-inline">
|
117
117
|
<label class="layui-form-label" style="width:100px;">实际签单时间:</label>
|
118
118
|
<div class="layui-input-inline" style="line-height: 38px;">
|
119
|
-
<input type="text" class="layui-input date" name="signed_date" autocomplete="off">
|
119
|
+
<input type="text" class="layui-input date" name="signed_date" autocomplete="off" value="<%= @last_follow_up&.signed_date %>">
|
120
120
|
</div>
|
121
121
|
</div>
|
122
122
|
<div class="layui-inline">
|
@@ -600,21 +600,22 @@
|
|
600
600
|
});
|
601
601
|
})
|
602
602
|
|
603
|
-
|
604
|
-
|
603
|
+
var signed_department_id = gon.value;
|
604
|
+
var add_department_select = selectInput.render({
|
605
605
|
elem: '#add_department',
|
606
|
-
name: '
|
606
|
+
name: 'signed_department', // 渲染的input的name值
|
607
607
|
layFilter: 'test', //同layui form参数lay-filter
|
608
608
|
// layVerify: 'required', //同layui form参数lay-verify
|
609
609
|
layVerType: 'tips', // 同layui form参数lay-verType
|
610
610
|
layReqText: '请填写文本', //同layui form参数lay-ReqText
|
611
|
-
initValue:
|
611
|
+
initValue: gon.value, // 渲染初始化默认值
|
612
612
|
hasSelectIcon: false,
|
613
613
|
placeholder: '请输入头歌平台上单位部门', // 渲染的inputplaceholder值
|
614
|
-
data: [],
|
614
|
+
data: [gon.department],
|
615
615
|
remoteSearch: true, // 是否启用远程搜索 默认是false,和远程搜索回调保存同步
|
616
616
|
remoteMethod: function (value, cb) { // 远程搜索的回调函数
|
617
617
|
if (!value) {
|
618
|
+
signed_department_id = "";
|
618
619
|
return cb([]);
|
619
620
|
}
|
620
621
|
request.get('missions/search?type=department&q=' + value, {}, function (res) {
|
@@ -626,7 +627,7 @@
|
|
626
627
|
form.on('submit(add_follow_up)', function (data) {
|
627
628
|
$(".submit-btn").addClass("layui-hide");
|
628
629
|
data.field.business_id = "<%= @business.id %>";
|
629
|
-
data.field.signed_department_id = add_department_select.getValue()
|
630
|
+
data.field.signed_department_id = add_department_select.getValue() || signed_department_id;
|
630
631
|
Rails.ajax({
|
631
632
|
url: "/missions/contracts/add_follow_ups",
|
632
633
|
type: 'POST',
|