apply-clients 3.0.10-206 → 3.0.10-209

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.10-206",
+  "version": "3.0.10-209",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -94,7 +94,7 @@
     "system-clients": "3.0.57",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.23.9-1",
+    "vue-client": "1.24.48",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/product/HiddenDangersInProjects/AddHiddenDangers.vue

@@ -601,7 +601,7 @@
         </div>
       </form>
     </validator>
-    <data-grid v-if="type==='view'"  :model="changemessage" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+    <data-grid v-if="type==='view'"  :model="changemessage" partial='list' v-ref:grid class="list_area table_sy">
       <template partial='head'>
         <tr>
           <th style="white-space: nowrap;">变更内容</th>
@@ -671,7 +671,8 @@
         hiddenrank: [{label: '全部', value: ''}, {label: '一般', value: '一般'},{label: '较大',value: '较大'},{label: '重大', value: '重大'}],
         org: this.$login.f.orgs,
         deps: this.$login.f.deps,
-        projectStatus: [{label: '全部', value: ''}, {label: '完工', value: '完工'},{label: '未完工', value: '未完工'},],
+        projectStatus: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目整改状态')],
+        // projectStatus: [{label: '全部', value: ''}, {label: '完工', value: '完工'},{label: '未完工', value: '未完工'}],
         oaapproval:[{label:'全部',value:''},{label:'是',value:'是'},{label:'否',value:'否'}],
         showModal: false,
         material: {},
@@ -836,7 +837,7 @@
           data: this.model.data,
         }
         let res = await this.$resetpost(
-          `gongcheng//logic/hiddenchangeMessage`,
+          `gongcheng/rs/logic/hiddenchangeMessage`,
           {data: this.contract},
           {resolveMsg: null,rejectMsg: '保存失败！！！'}
         )

package/src/components/product/HiddenDangersInProjects/HiddenProjectList.vue

@@ -66,8 +66,8 @@
             <label  for="startDate" class="font_normal_body">预计完工时间：</label>
             <datepicker id="startDate1" placeholder="开始日期"
                         style="width: 60%!important;"
-                        v-model="model.startDate"
-                        :value.sync="model.startDate"
+                        v-model="model.startDate2"
+                        :value.sync="model.startDate2"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
                         condition="f_complete_working_date <= '{}'">
@@ -83,6 +83,7 @@
           <div class="form-group col-sm-12 button-range" style="float: right">
             <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
             <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+            <button class="button_search button_spacing" @click="$parent.$parent.return()" v-el:cx>返回</button>
             <export-excel progress="apply_getExportProgress"
                           :data="{condition: $parent.$parent.condition}"
                           :field="$parent.$parent.getfield()"
@@ -185,8 +186,10 @@
             <nobr><font>{{row.f_hidden_budget_correction}}</font></nobr>
           </td>
           <td :class="$parent.$parent.$parent.rowclass(row)" style="text-align: center;">
+            <nobr>
                   <a href="#" @click="$parent.$parent.$parent.openRenew(row)">修改</a>&emsp;|&emsp;
                   <a href="#" @click="$parent.$parent.$parent.deleteRow(row)">删除</a>
+            </nobr>
           </td>
         </tr>
       </template>
@@ -226,8 +229,9 @@
           }
         }
         ),
+        projectStatus: [{label: '全部', value: ''}, ...this.$appdata.getParam('项目整改状态')],
         hiddenrank: [{label: '全部', value: ''}, {label: '一般', value: '一般'},{label: '较大',value: '较大'},{label: '重大', value: '重大'}],
-        projectStatus: [{label: '全部', value: ''}, {label: '完工项目', value: '完工项目'},{label: '在建项目',value: '在建项目'},{label: '未建项目', value: '未建项目'},{label: '停工项目',value: '停工项目'}],
+        // projectStatus: [{label: '全部', value: ''}, {label: '完工', value: '完工'},{label: '未完工', value: '未完工'}],
         criteriaShow: false,
         apply_org: [],
         chargeAll: {
@@ -351,6 +355,9 @@
       search () {
         this.$dispatch('search')
       },
+      return(){
+        this.$dispatch('return')
+      },
       getfield() {
         let report = {
           'f_hidden_name': '工程项目名称',

package/src/components/product/HiddenDangersInProjects/HiddenProjectSchedule.vue

@@ -127,6 +127,14 @@
         this.$refs.query.$refs.cp.pager = true
         // 调用查询
         this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'return'(){
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
       }
     },
     computed: {