system-clients 1.6.71 → 1.6.72-foric

package/src/components/parammanage/ParamPage.vue

@@ -8,15 +8,18 @@
       <label class="control-label">使用公司</label>
       <div class="form-control" style="border: 0px">
         <res-select restype='organization'
-                    :is-mul="false"
+                    is-mul="false"
                     :initresid="curorgid"
                     @res-select="getorgCur">
         </res-select>
       </div>
 
       <label class="control-label">参数名称</label>
-      <input type="text" class="form-control"  placeholder='请输入查找的参数名' v-model="conditionModel.paramName" @keyup.enter="filter_query(param, f_orgid_current)">
-      <button class="btn btn-primary" @click="filter_query(conditionModel.paramName,conditionModel.f_cond_orgid)">查询</button>
+      <input type="text" class="form-control"  placeholder='请输入查找的参数名' v-model="param" @keyup.enter="filter_query(param, f_orgid_current)">
+      <button class="btn btn-primary" @click="filter_query(param,f_orgid_current)">查询</button>
+
+      <button class="btn btn-primary" @click="copyView()">参数复制</button>
+
     </div>
     <div class="span">
       <partial-view v-ref:params-load>
@@ -25,19 +28,15 @@
             <tr>
               <th>序号</th>
               <th>名称</th>
-              <th>所属</th>
               <th>操作</th>
             </tr>
           </template>
           <template partial='body'>
-            <td  style="text-align:center">{{$index+1}}</td>
-            <td style="text-align:center">{{row.name}}</td>
-            <td style="text-align:center">{{row.orgname ? row.orgname + '专用' : '全局'}}</td>
+            <td>{{$index+1}}</td>
+            <td>{{row.name}}</td>
             <td class="flex-around">
-              <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modifyParam(row, 't_parameter')">修改</button>
-              <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.deleteParam(row, 't_parameter')">删除</button>
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.deleteParam(row)">删除</button>
             </td>
           </template>
         </data-grid>
@@ -59,71 +58,73 @@
             </tr>
           </template>
           <template partial='body'>
-            <td style="text-align:center">{{$index+1}}</td>
-            <td style="text-align:center">{{row.name}}</td>
+            <td>{{$index+1}}</td>
+            <td>{{row.name}}</td>
             <td class="flex-around">
-              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.modifyParam(row, 't_paramvalue')">修改</button>
-              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.deleteParam(row, 't_paramvalue')">删除</button>
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.modifyParam(row)">修改</button>
+              <button type="button" name="button" class="btn btn-link" @click.stop="$parent.$parent.$parent.deleteParam(row, $index)">删除</button>
             </td>
           </template>
         </data-grid>
       </partial-view>
     </div>
 
-    <modal v-if="show" :show.sync="show" v-ref:modal backdrop="false">
+    <modal :show.sync="show" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header">
         <button type="button" class="close" @click="close"><span>&times;</span></button>
         <h4 class="modal-title">参数配置</h4>
       </header>
-      <article slot="modal-body" class="modal-body" style="height: 90px">
-        <form class="form-horizontal">
-          <div class="form-group">
-            <label class="col-sm-2 control-label">参数名称</label>
-            <div class="col-sm-4">
-              <input type="text" class="form-control" v-model="modifyItem.name" @keyup.enter="confirm">
-            </div>
-            <div class="col-sm-offset-2 col-sm-4" v-if="modifyItem.EntityType === 't_parameter'">
-              <div class="checkbox">
-                <label>
-                  <input type="checkbox" v-model="modifyItem.isGlobal" :checked="modifyItem.isGlobal">是否全局
-                </label>
-              </div>
-            </div>
+      <article slot="modal-body" class="modal-body">
+        <div class="from-group">
+          <label for="">参数名称</label>
+          <input type="text" class="form-control" v-model="modifyItem.name" @keyup.enter="confirm">
+        </div>
+      </article>
+
+      <footer slot="modal-footer" class="modal-footer">
+        <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+        <button v-show="show" type="button" class="btn btn-success" @click='confirm'>确认</button>
+      </footer>
+    </modal>
+
+    <modal :show.sync="copyShow" v-ref:modal backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="close"><span>&times;</span></button>
+        <h4 class="modal-title">参数复制</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="form-inline auto">
+          <div class="form-control" style="border: 0px">
+            <res-select restype='organization'
+                        is-mul="false"
+                        @res-select="getorgSource">
+            </res-select>
           </div>
-          <div class="form-group" v-if="modifyItem.EntityType === 't_parameter' && !modifyItem.isGlobal">
-            <label class="col-sm-2 control-label">所属公司</label>
-            <div class="col-sm-4">
-              <res-select restype='organization'
-                          :is-mul="false"
-                          :initresid="[conditionModel.f_cond_orgid]"
-                          @res-select="getModifyOrg">
-              </res-select>
-            </div>
+          <!--<button class="btn btn-primary" @click.stop="copyParams()">复制到</button>-->
+          <strong>复制到</strong>
+          <div class="form-control" style="border: 0px">
+            <res-select restype='organization'
+                        is-mul="false"
+                        @res-select="getorgTarget">
+            </res-select>
           </div>
-        </form>
+        </div>
       </article>
-
       <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-success" @click='confirm'>确认</button>
         <button type="button" class="btn btn-default" @click='close'>取消</button>
+        <button type="button" class="btn btn-success" @click='copyParams'>确认</button>
       </footer>
     </modal>
-
   </div>
 </template>
 <script>
 
-  import {HttpResetClass} from 'vue-client'
 
   export default {
     title: '用户操作',
     data () {
       return {
-        conditionModel: {
-          paramName: null,
-          f_cond_orgid: null
-        },
-
+        allParams: null,  // 获取到所有的参数
         model: {  // 参数列表显示的数据
           rows: []
         },
@@ -134,9 +135,7 @@
         },
         selectContent: null, // 选中的一条数据（包含参数或参数的具体内容）
         modifyItem: {
-          name: '',
-          isGlobal: true,
-          f_filialeids: null
+          name: ''
         }, // 要修改的参数
 
         copyShow: false,
@@ -148,108 +147,95 @@
         },
 
         curorgid: [this.$login.f.orgid],
-        jurisdiction: this.$login.r
+
+        f_orgid_current: this.$login.f.orgid,
+        f_orgid_source: '',
+        f_orgid_target: ''
       }
     },
     ready () {
-      this.loadParams()
-    },
-    watch: {
-      'modifyItem.isGlobal' (val) {
-        if (val) {
-          this.modifyItem.f_filialeids = null
-        }
-      }
+      this.loadParams().then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
     },
     methods: {
       // 加载全部参数
       loadParams () {
-        let param = {
-          condition: '1=1',
-          f_filialeid: this.$login.f.orgid
-        }
-        this.queryParam(param)
-      },
-      async queryParam (condition) {
-        this.model.rows = []
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getParam', {data: condition}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
-        this.model.rows = res.data
+        return this.$refs.paramsLoad.load('rs/sql/hql/simpleHql/all?pageSize=999999', {data: {tablename: 't_parameter'}}).then((res) => {
+          this.allParams = res.data
+          this.filter_query(null, this.$login.f.orgid)
+        })
       },
       selected (val) {
         this.selectItem = val.val
-        this.getParamValue(val.val)
+        this.params.rows = val.val.f_paramvalues
       },
-      async getParamValue(obj) {
-        let http = new HttpResetClass()
-        let res = await http.load('POST', 'rs/sql/system_getParamValue', {data: {param_id: obj.id}}, {resolveMsg: null, rejectMsg: '获取参数出错！！'})
-        this.params.rows  = res.data
+      copyView () {
+        this.copyShow = true
       },
-      filter_query (paramName,orgid) {
-        console.log('过滤查询',paramName, orgid)
-        this.selectItem = null
-        let param = {}
-        if (paramName && orgid) {
-          param = {
-            condition: `p.name like '%${paramName}%'`,
-            f_filialeid: orgid
-          }
-        } else if (orgid) {
-          param = {
-            condition: '1=1',
-            f_filialeid: orgid
-          }
-        } else if (paramName) {
-          param = {
-            condition: `p.name like '%${paramName}%'`,
-            f_filialeid: this.$login.f.orgid
-          }
+      filter_query (param,orgid) {
+        console.log('过滤查询',param, orgid)
+        this.model.rows = []
+        if (param) {
+          this.model.rows = this.allParams.filter((item) => {
+            return orgid==(item.f_filialeids) && item.name.includes(param)
+          })
         } else {
-          param = {
-            condition: '1=1',
-            f_filialeid: this.$login.f.orgid
-          }
+          this.model.rows = this.allParams.filter((item) => {
+            return orgid==(item.f_filialeids)
+          })
         }
-        this.queryParam(param)
 
       },
+      filter_copy (orgid) {
+        this.selectItem = null
+        this.copySource.rows = []
+        this.copySource.rows = this.allParams.filter((item) => {
+          return orgid==(item.f_filialeids)
+        })
+      },
       // 添加参数或添加参数内容
       add (type) {
-        this.modifyItem.name = ''
-        this.modifyItem.isGlobal = true
-        this.modifyItem.EntityType = type
         this.show = true
+        this.modifyItem.EntityType = type
       },
       // 修改参数或添加参数内容
-      modifyParam (row, type) {
+      modifyParam (row) {
+        this.show = true
         this.selectContent = row
         this.modifyItem.name = row.name
         this.modifyItem.id = row.id
-        this.modifyItem.EntityType = type
-        this.modifyItem.isGlobal = !row.orgname
-        this.show = true
+        this.modifyItem.EntityType = row.EntityType
+        // this.tempName = row.name
       },
       // 删除
-      deleteParam (row, type) {
-        if (type === 't_parameter') {
+      deleteParam (row, index) {
+        if (row.EntityType === 't_parameter') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('rs/logic/deleteParam', row).then((res) => {
-                this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
+              this.$refs.paramsLoad.load('rs/logic/deleteParam', row).then((res) => {
+                this.operate(this.allParams,row)
+                this.operate(this.model.rows,row)
                 this.selectItem = null
               })
             }
           })
-        } else if (type === 't_paramvalue') {
+        } else if (row.EntityType === 't_paramvalue') {
           this.$showMessage('删除后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
             if (res === 'confirm') {
-              this.$resetpost('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
-                this.getParamValue(this.selectItem)
+              this.$refs.selectsLoad.load('rs/logic/deleteValue', {tablename: 't_paramvalue', id: row.id}).then((res) => {
+                this.params.rows.splice(index, 1)
               })
             }
           })
         }
       },
+      operate(array,row){
+        let index = array.indexOf(row)
+        array.splice(index,1)
+      },
       // 修该内容的提交
       confirm () {
         let data = {}
@@ -264,14 +250,26 @@
             data = {
               name: this.modifyItem.name
             }
-            //添加当前分公司
           }
-          data.f_filialeids = this.modifyItem.f_filialeids
-          this.$resetpost('rs/logic/system_saveParam', data).then((res) => {
+          //添加当前分公司
+          data.f_filialeids = this.$login.f.orgid
+          this.$refs.paramsLoad.load('rs/entity/t_parameter', data).then((res) => {
             //无id
-            this.filter_query(this.conditionModel.paramName, this.conditionModel.f_cond_orgid)
+            if(!data.id){
+              let resdata = {
+                EntityType: "t_parameter",
+                name: data.name,
+                id: res.data.id,
+                f_paramvalues: [],
+                f_filialeids: data.f_filialeids
+              }
+              this.allParams.push(resdata)
+              this.model.rows.push(resdata)
+            }else{
+              this.selectContent.name = data.name
+            }
             this.show = false
-            this.modifyItem = {name: '', isGlobal: true, f_filialeids: null}
+            this.modifyItem = {name: ''}
           })
         } else if (this.modifyItem.EntityType === 't_paramvalue') {
           if (this.modifyItem.id) {
@@ -286,27 +284,52 @@
               processid: this.selectItem.id
             }
           }
-          this.$resetpost('rs/entity/t_paramvalue', data).then((res) => {
+          this.$refs.selectsLoad.load('rs/entity/t_paramvalue', data).then((res) => {
             this.show = false
             // 如果没有id，需要在数组中添加
-            this.getParamValue(this.selectItem)
+            if (!data.id) {
+              this.params.rows.push({id: res.data.id, name: this.modifyItem.name, processid: this.selectItem.id, EntityType: 't_paramvalue'})
+            }else {
+              this.selectContent.name = data.name
+            }
+            this.modifyItem = {name: ''}
           })
         }
-
       },
       // 关闭模态框, 数据还原
       close () {
         this.copyShow = false
         this.show = false
-        this.modifyItem = {name: '', isGlobal: true, f_filialeids: null}
+        this.modifyItem = {name: ''}
+      },
+
+      getorgCur (val) {
+        this.f_orgid_current = val[0]
       },
 
-      getModifyOrg (val) {
-        this.modifyItem.f_filialeids = val[0]
+      getorgSource (val) {
+        this.f_orgid_source = val[0]
       },
 
-      getorgCur (val) {
-        this.conditionModel.f_cond_orgid = val[0]
+      getorgTarget (val) {
+        this.f_orgid_target = val[0]
+      },
+
+      copyParams(){
+
+        this.filter_copy(this.f_orgid_source)
+
+        if(this.f_orgid_target && this.copySource.rows.length!=0 && this.f_orgid_target!=this.copySource.rows[0].f_filialeids){
+          this.copySource.f_filialeids = this.f_orgid_target
+          this.$refs.paramsLoad.load('rs/logic/copyParam', this.copySource).then((res) => {
+            this.loadParams()
+            this.selectItem = null
+            this.$showAlert('复制成功', 'success', 2000)
+            this.copyShow = false
+          })
+        }else{
+          this.$showAlert('选择有误', 'danger', 0)
+        }
       }
     }
   }