apply-clients 3.0.10-211 → 3.0.10-212

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.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/product/HiddenDangersInProjects/AddHiddenDangers.vue +20 -20
  3. package/src/components/product/HiddenDangersInProjects/HiddenProjectList.vue +1 -1
  4. package/src/components/product/HiddenDangersInProjects/HiddenProjectSchedule.vue +1 -1
  5. package/src/components/product/ProjectManagement/AddProjectSchedule.vue +27 -0
  6. package/src/components/product/ProjectManagement/ProjectList.vue +2 -16
  7. package/src/components/product/ProjectManagement/ProjectSchedule.vue +0 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.0.10-211",
3
+ "version": "3.0.10-212",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
package/src/components/product/HiddenDangersInProjects/AddHiddenDangers.vue CHANGED
@@ -8,7 +8,7 @@
8
8
  <div class="col-sm-6">
9
9
  <input type="text" v-model="contract.f_orgname" v-validate:f_orgname = "['required']" v-show="false">
10
10
  <input-select
11
- :disable="((tp.f_orgname != '' && tp.f_orgname != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
11
+ :disable="type == 'view'"
12
12
  class="select select_list"
13
13
  :readonly="type === 'view'"
14
14
  :value.sync="contract.f_orgname"
@@ -22,7 +22,7 @@
22
22
  <div class="col-sm-6">
23
23
  <input type="text" v-model="contract.f_hidden_name" v-validate:f_hidden_name = "['required']" v-show="false">
24
24
  <input
25
- :disabled="((tp.f_hidden_name != '' && tp.f_hidden_name != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
25
+ :disabled="type == 'view'"
26
26
  class="text"
27
27
  :readonly="type === 'view'"
28
28
  :value.sync="contract.f_hidden_name"
@@ -35,7 +35,7 @@
35
35
  <div class="col-sm-6">
36
36
  <input type="text" v-model="contract.f_hidden_address" v-validate:f_hidden_address = "['required']" v-show="false">
37
37
  <input
38
- :disabled="((tp.f_hidden_address != '' && tp.f_hidden_address != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
38
+ :disabled="type == 'view'"
39
39
  class="text"
40
40
  :readonly="type === 'view'"
41
41
  :value.sync="contract.f_hidden_address"
@@ -48,7 +48,7 @@
48
48
  <div class="col-sm-6">
49
49
  <input type="text" v-model="contract.f_hidden_classes" v-validate:f_hidden_classes = "['required']" v-show="false">
50
50
  <input
51
- :disabled="((tp.f_hidden_classes != '' && tp.f_hidden_classes != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
51
+ :disabled="type == 'view'"
52
52
  class="text"
53
53
  :readonly="type === 'view'"
54
54
  :value.sync="contract.f_hidden_classes"
@@ -62,7 +62,7 @@
62
62
  <div class="col-sm-6">
63
63
  <input type="text" v-model="contract.f_hidden_rank" v-validate:f_hidden_rank = "['required']" v-show="false">
64
64
  <input-select
65
- :disable="((tp.f_hidden_rank != '' && tp.f_hidden_rank != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
65
+ :disable="type == 'view'"
66
66
  class="select select_list"
67
67
  :readonly="type === 'view'"
68
68
  :value.sync="contract.f_hidden_rank"
@@ -76,7 +76,7 @@
76
76
  <div class="col-sm-6">
77
77
  <input type="text" v-model="contract.f_hidden_describe" v-validate:f_hidden_describe = "['required']" v-show="false">
78
78
  <input
79
- :disabled="((tp.f_hidden_describe != '' && tp.f_hidden_describe != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
79
+ :disabled="type == 'view'"
80
80
  class="text col-sm-6"
81
81
  style="width: 1000px;height: 35px"
82
82
  :readonly="type === 'view'"
@@ -93,7 +93,7 @@
93
93
  <input type="text" v-model="contract.f_hidden_scheme" v-validate:f_hidden_scheme = "['required']" v-show="false">
94
94
  <input
95
95
  style="width: 1000px;height: 35px"
96
- :disabled="((tp.f_hidden_scheme != '' && tp.f_hidden_scheme != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
96
+ :disabled="type == 'view'"
97
97
  class="text"
98
98
  :readonly="type === 'view'"
99
99
  :value.sync="contract.f_hidden_scheme"
@@ -110,7 +110,7 @@
110
110
  <input
111
111
  class="text"
112
112
  :readonly="type === 'view'"
113
- :disabled="((tp.f_hidden_schemer != '' && tp.f_hidden_schemer != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
113
+ :disabled=" type == 'view'"
114
114
  :value.sync="contract.f_hidden_schemer"
115
115
  v-model="contract.f_hidden_schemer"
116
116
  :valueSingle="true"/>
@@ -125,7 +125,7 @@
125
125
  <input
126
126
  class="text"
127
127
  :readonly="type === 'view'"
128
- :disabled="((tp.f_project_unit != '' && tp.f_project_unit != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
128
+ :disabled="type == 'view'"
129
129
  :value.sync="contract.f_project_unit"
130
130
  v-model="contract.f_project_unit"
131
131
  :valueSingle="true"/>
@@ -138,7 +138,7 @@
138
138
  <input type="text" v-model="contract.f_troubleshoot_date" v-validate:f_troubleshoot_date = "['required']" v-show="false">
139
139
  <datepicker
140
140
  :readonly="type === 'view'"
141
- :disabled="((tp.f_troubleshoot_date != '' && tp.f_troubleshoot_date != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
141
+ :disabled="type == 'view'"
142
142
  :click="getleadtime()"
143
143
  :value.sync="contract.f_troubleshoot_date"
144
144
  format="yyyy-MM-dd"
@@ -153,7 +153,7 @@
153
153
  <input-select
154
154
  class="select select_list"
155
155
  :readonly="type === 'view'"
156
- :disable="((tp.f_oa_approval != '' && tp.f_oa_approval != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
156
+ :disable="type == 'view'"
157
157
  :value.sync="contract.f_oa_approval"
158
158
  v-model="contract.f_oa_approval"
159
159
  :options="oaapproval"
@@ -166,7 +166,7 @@
166
166
  <input type="text" v-model="contract.f_project_state" v-show="false">
167
167
  <input-select
168
168
  class="select select_list"
169
- :disable="((org !== '重庆盛焰集团' || (org === '重庆盛焰集团' && deps !== '安全部')) && type != 'add') || type == 'view'"
169
+ :disable="type == 'view'"
170
170
  :readonly="type === 'view'"
171
171
  :value.sync="contract.f_project_state"
172
172
  v-model="contract.f_project_state"
@@ -183,7 +183,7 @@
183
183
  :readonly="type === 'view'"
184
184
  :value.sync="contract.f_budget_correction_fee"
185
185
  v-model="contract.f_budget_correction_fee"
186
- :disabled="((tp.f_budget_correction_fee != '' && tp.f_budget_correction_fee != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
186
+ :disabled="type == 'view'"
187
187
  :valueSingle="true"/>
188
188
  </div>
189
189
  </div>
@@ -248,7 +248,7 @@
248
248
  <input type="text" v-model="contract.f_total_payment" v-show="false">
249
249
  <input
250
250
  class="text"
251
- :readonly="type === 'view'"
251
+ :readonly="true"
252
252
  :value.sync="contract.f_total_payment"
253
253
  v-model="contract.f_total_payment"
254
254
  :valueSingle="true"/>
@@ -260,7 +260,7 @@
260
260
  <input type="text" v-model="contract.f_start_working_date" v-validate:f_start_working_date = "['required']" v-show="false">
261
261
  <datepicker
262
262
  :readonly="type === 'view'"
263
- :disabled="((tp.f_start_working_date != '' && tp.f_start_working_date != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
263
+ :disabled="type == 'view'"
264
264
  :click="getleadtime()"
265
265
  :value.sync="contract.f_start_working_date"
266
266
  format="yyyy-MM-dd"
@@ -276,7 +276,7 @@
276
276
  :click="getleadtime()"
277
277
  :readonly="type === 'view'"
278
278
  :value.sync="contract.f_complete_working_date"
279
- :disabled="((tp.f_complete_working_date != '' && tp.f_complete_working_date != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
279
+ :disabled="type == 'view'"
280
280
  format="yyyy-MM-dd"
281
281
  v-model="contract.f_complete_working_date">
282
282
  </datepicker>
@@ -301,7 +301,7 @@
301
301
  <input type="text" v-model="contract.f_start_practical_date" v-show="false">
302
302
  <datepicker
303
303
  :readonly="type === 'view'"
304
- :disabled="((tp.f_start_practical_date != '' && tp.f_start_practical_date != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
304
+ :disabled="type == 'view'"
305
305
  :click="getleadtime()"
306
306
  :value.sync="contract.f_start_practical_date"
307
307
  format="yyyy-MM-dd"
@@ -316,7 +316,7 @@
316
316
  <datepicker
317
317
  :click="getleadtime()"
318
318
  :readonly="type === 'view'"
319
- :disabled="((tp.f_complete_practical_date != '' && tp.f_complete_practical_date != null) && !(org == '重庆盛焰集团' && deps == '安全部') && (type == 'renew')) || type == 'view'"
319
+ :disabled="type == 'view'"
320
320
  :value.sync="contract.f_complete_practical_date"
321
321
  format="yyyy-MM-dd"
322
322
  v-model="contract.f_complete_practical_date">
@@ -358,7 +358,7 @@
358
358
  <input type="text" v-model="contract.f_hidden_dangers" v-show="false">
359
359
  <input-select
360
360
  class="select select_list"
361
- :disable="((org !== '重庆盛焰集团' || (org === '重庆盛焰集团' && deps !== '安全部')) && type != 'add') || type == 'view'"
361
+ :disable="type == 'view'"
362
362
  :readonly="type === 'view'"
363
363
  :value.sync="contract.f_hidden_dangers"
364
364
  v-model="contract.f_hidden_dangers"
@@ -373,7 +373,7 @@
373
373
  <input-select
374
374
  class="select select_list"
375
375
  :readonly="type === 'view'"
376
- :disable="((org !== '重庆盛焰集团' || (org === '重庆盛焰集团' && deps !== '安全部')) && type != 'add') || type == 'view'"
376
+ :disable="type == 'view'"
377
377
  :value.sync="contract.f_hidden_budget_correction"
378
378
  v-model="contract.f_hidden_budget_correction"
379
379
  :options="budgetcorrection"
package/src/components/product/HiddenDangersInProjects/HiddenProjectList.vue CHANGED
@@ -92,7 +92,7 @@
92
92
  template-name='安全隐患导出'
93
93
  :choose-col="true">
94
94
  </export-excel>
95
- <button class="button_new button_spacing" style="width: 100px" @click="$parent.$parent.openAddContract()">添加工程</button>
95
+ <button class="button_new button_spacing" style="width: 100px" @click="$parent.$parent.openAddContract()">添加隐患</button>
96
96
  </div>
97
97
  </div>
98
98
  </div>
package/src/components/product/HiddenDangersInProjects/HiddenProjectSchedule.vue CHANGED
@@ -24,7 +24,7 @@
24
24
  <script>
25
25
 
26
26
  export default {
27
- title: '工程项目进度列表 ',
27
+ title: '隐患项目进度列表 ',
28
28
  data () {
29
29
  return {
30
30
  showData: true,
package/src/components/product/ProjectManagement/AddProjectSchedule.vue CHANGED
@@ -394,6 +394,33 @@
394
394
  </datepicker>
395
395
  </div>
396
396
  </div>
397
+ <div class="col-sm-8 form-group item">
398
+ <label class="control-label-justify control-label col-sm-6">总部市场部意见反馈</label>
399
+ <div class="col-sm-6">
400
+ <input type="text" v-model="contract.f_zong_sc_info" v-show="false">
401
+ <input
402
+ class="text"
403
+ style="width: 600px;height: 35px"
404
+ :disabled="!(org === '重庆盛焰集团' && deps === '市场部') || type == 'view'"
405
+ :readonly="type == 'view'"
406
+ :value.sync="contract.f_zong_sc_info"
407
+ v-model="contract.f_zong_sc_info"
408
+ :valueSingle="true"/>
409
+ </div>
410
+ </div>
411
+ <div class="col-sm-4 form-group item">
412
+ <label class="control-label-justify control-label col-sm-6">预计完成时间</label>
413
+ <div class="col-sm-6">
414
+ <input type="text" v-model="contract.f_ziorg_sc_date" v-show="false">
415
+ <datepicker
416
+ :readonly="type === 'view'"
417
+ :disabled="!(org === '重庆盛焰集团' && deps === '市场部') || type == 'view'"
418
+ :value.sync="contract.f_ziorg_sc_date"
419
+ format="yyyy-MM-dd"
420
+ v-model="contract.f_ziorg_sc_date">
421
+ </datepicker>
422
+ </div>
423
+ </div>
397
424
  <div class="col-sm-8 form-group item">
398
425
  <label class="control-label-justify control-label col-sm-6">总部物资部意见反馈</label>
399
426
  <div class="col-sm-6">
package/src/components/product/ProjectManagement/ProjectList.vue CHANGED
@@ -324,14 +324,12 @@
324
324
  }
325
325
  })
326
326
  },
327
- // 添加合同
328
327
  openAddContract () {
329
328
  this.$dispatch('openAddContract')
330
329
  },
331
330
  return(){
332
331
  this.$dispatch('return')
333
332
  },
334
- // 查看合同详情
335
333
  openViewContract (row) {
336
334
  this.$dispatch('openViewContract', row)
337
335
  },
@@ -377,6 +375,8 @@
377
375
  'f_ziorg_date': '子公司意见反馈时间',
378
376
  'f_zong_gc_info': '总部工程部意见反馈',
379
377
  'f_ziorg_gc_date': '总部工程部意见反馈时间',
378
+ 'f_zong_sc_info': '总部市场部意见反馈',
379
+ 'f_ziorg_sc_date': '总部市场部意见反馈时间',
380
380
  'f_zong_wz_info': '总部物资部意见反馈',
381
381
  'f_zong_wz_date': '总部物资部意见反馈时间',
382
382
  'f_zong_sj_info': '总部设计部意见反馈',
@@ -392,20 +392,6 @@
392
392
  events: {
393
393
  },
394
394
  computed: {
395
- rowclass () {
396
- return function (contract) {
397
- if (contract.f_contract_nature === '单次' && contract.f_contract_status !== '有效') {
398
- return 'danger'
399
- }
400
- if ((contract.f_contract_nature === '年度' && new Date() > new Date(contract.f_contract_expiration_date) )|| contract.f_contract_status === '无效') {
401
- return 'danger'
402
- }
403
- if (contract.f_contract_nature === '年度' && new Date() > new Date(contract.f_contract_early_warning_date)) {
404
- return 'warning'
405
- }
406
- return ''
407
- }
408
- }
409
395
  }
410
396
  }
411
397
  </script>
package/src/components/product/ProjectManagement/ProjectSchedule.vue CHANGED
@@ -97,10 +97,8 @@
97
97
 
98
98
  this.$refs.query.search()
99
99
  },
100
- // 打开添加合同
101
100
  async 'openAddContract' () {
102
101
  this.contract = {}
103
- // 获取唯一标识，用于保存文件
104
102
  let res = await this.$resetpost(
105
103
  `gongcheng/rs/logic/getUUID`,
106
104
  null,