apply-clients 3.0.10-207 → 3.0.10-208

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 (5) hide show
  1. package/package.json +2 -2
  2. package/src/components/product/HiddenDangersInProjects/AddHiddenDangers.vue +2 -1
  3. package/src/components/product/HiddenDangersInProjects/HiddenProjectList.vue +4 -3
  4. package/src/components/product/ProjectManagement/AddProjectSchedule.vue +2 -1
  5. package/src/components/product/ProjectManagement/ProjectList.vue +5 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.0.10-207",
3
+ "version": "3.0.10-208",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -94,7 +94,7 @@
94
94
  "system-clients": "3.0.57",
95
95
  "system-phone": "1.1.18",
96
96
  "url-loader": "^0.5.7",
97
- "vue-client": "1.23.9-1",
97
+ "vue-client": "1.24.48",
98
98
  "vue-hot-reload-api": "^1.2.0",
99
99
  "vue-html-loader": "^1.0.0",
100
100
  "vue-loader": "^8.2.1",
package/src/components/product/HiddenDangersInProjects/AddHiddenDangers.vue CHANGED
@@ -671,7 +671,8 @@
671
671
  hiddenrank: [{label: '全部', value: ''}, {label: '一般', value: '一般'},{label: '较大',value: '较大'},{label: '重大', value: '重大'}],
672
672
  org: this.$login.f.orgs,
673
673
  deps: this.$login.f.deps,
674
- projectStatus: [{label: '全部', value: ''}, {label: '完工', value: '完工'},{label: '未完工', value: '未完工'},],
674
+ projectStatus: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目整改状态')],
675
+ // projectStatus: [{label: '全部', value: ''}, {label: '完工', value: '完工'},{label: '未完工', value: '未完工'}],
675
676
  oaapproval:[{label:'全部',value:''},{label:'是',value:'是'},{label:'否',value:'否'}],
676
677
  showModal: false,
677
678
  material: {},
package/src/components/product/HiddenDangersInProjects/HiddenProjectList.vue CHANGED
@@ -66,8 +66,8 @@
66
66
  <label for="startDate" class="font_normal_body">预计完工时间：</label>
67
67
  <datepicker id="startDate1" placeholder="开始日期"
68
68
  style="width: 60%!important;"
69
- v-model="model.startDate"
70
- :value.sync="model.startDate"
69
+ v-model="model.startDate2"
70
+ :value.sync="model.startDate2"
71
71
  :format="'yyyy-MM-dd HH:mm:ss'"
72
72
  :show-reset-button="true"
73
73
  condition="f_complete_working_date <= '{}'">
@@ -229,8 +229,9 @@
229
229
  }
230
230
  }
231
231
  ),
232
+ projectStatus: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目整改状态')],
232
233
  hiddenrank: [{label: '全部', value: ''}, {label: '一般', value: '一般'},{label: '较大',value: '较大'},{label: '重大', value: '重大'}],
233
- projectStatus: [{label: '全部', value: ''}, {label: '完工项目', value: '完工项目'},{label: '在建项目',value: '在建项目'},{label: '未建项目', value: '未建项目'},{label: '停工项目',value: '停工项目'}],
234
+ // projectStatus: [{label: '全部', value: ''}, {label: '完工', value: '完工'},{label: '未完工', value: '未完工'}],
234
235
  criteriaShow: false,
235
236
  apply_org: [],
236
237
  chargeAll: {
package/src/components/product/ProjectManagement/AddProjectSchedule.vue CHANGED
@@ -570,8 +570,9 @@
570
570
  model: {
571
571
  data: []
572
572
  },
573
+ projectStatus: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目状态')],
573
574
  projectsettlement: [{label: '全部', value: ''}, {label: '是', value: '是'},{label: '否',value: '否'}],
574
- projectStatus: [{label: '全部', value: ''}, {label: '完工项目', value: '完工项目'},{label: '在建项目',value: '在建项目'},{label: '未建项目', value: '未建项目'},{label: '停工项目',value: '停工项目'}],
575
+ // projectStatus: [{label: '全部', value: ''}, {label: '完工项目', value: '完工项目'},{label: '在建项目',value: '在建项目'},{label: '未建项目', value: '未建项目'},{label: '停工项目',value: '停工项目'},{label: '市场已立项未动工',value: '市场已立项未动工'}],
575
576
  showModal: false,
576
577
  material: {},
577
578
  old:{},
package/src/components/product/ProjectManagement/ProjectList.vue CHANGED
@@ -55,8 +55,8 @@
55
55
  <label for="startDate" class="font_normal_body">预计完工时间：</label>
56
56
  <datepicker id="startDate1" placeholder="开始日期"
57
57
  style="width: 60%!important;"
58
- v-model="model.startDate"
59
- :value.sync="model.startDate"
58
+ v-model="model.startDate1"
59
+ :value.sync="model.startDate1"
60
60
  :format="'yyyy-MM-dd HH:mm:ss'"
61
61
  :show-reset-button="true"
62
62
  condition="f_complete_working_date <= '{}'">
@@ -219,7 +219,8 @@
219
219
  }
220
220
  }
221
221
  ),
222
- projectStatus: [{label: '全部', value: ''}, {label: '完工项目', value: '完工项目'},{label: '在建项目',value: '在建项目'},{label: '未建项目', value: '未建项目'},{label: '停工项目',value: '停工项目'}],
222
+ projectStatus: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目状态')],
223
+ // projectStatus: [{label: '全部', value: ''}, {label: '完工项目', value: '完工项目'},{label: '在建项目',value: '在建项目'},{label: '未建项目', value: '未建项目'},{label: '停工项目',value: '停工项目'},{label: '市场已立项未动工',value: '市场已立项未动工'}],
223
224
  projectsettlements: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
224
225
  criteriaShow: false,
225
226
  apply_org: [],
@@ -301,7 +302,7 @@
301
302
  },
302
303
  searchCondition (args) {
303
304
  if(this.$login.f.orgs !== '重庆盛焰集团') {
304
- args.condition += ` and f_orgid = '${this.$login.f.orgid}'`
305
+ args.condition += ` and f_orgname = '${this.$login.f.orgs}'`
305
306
  }
306
307
  if (!isEmpty(args.model.f_contract_status)) {
307
308
  args.condition += ` and ${args.model.f_contract_status}`