manage-client 3.2.86-4 → 3.2.88-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.86-4",
+  "version": "3.2.88-1",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

package/src/components/SellReport/ReportItems.vue

@@ -1,62 +1,51 @@
 <template>
   <div class="flex">
-    <partial-view v-ref:pv>
+        <div class="row" style="height: 5%">
+          <div class="col-sm-10">
+            <label class="font_normal_body">报表名称:</label>
+            <v-select multiple
+                      :value.sync="modelinfo.f_report_name"
+                      class="select_list select"
+                      v-model="modelinfo.f_report_name"
+                      :options='reportNames' placeholder='请选择'
+                      @keyup.enter="chaxun()"
+            ></v-select>
+          </div>
+          <div class="col-sm-2">
+            <button class="button_search left"   @click="chaxun()">查询</button>
+            &nbsp;&nbsp;
+          </div>
+        </div>
+    <partial-view  v-ref:pv>
       <div class="span" v-show="!filtrate">
-        <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0" title="选中报表后双击查看报表的配置信息" @dblclick="Update()">报表类型</p>
-        <div style="height: 94%;overflow: auto;width: 104%">
+        <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0"  >报表类型
+          <button class="button_search-3 button_spacing border-right"  v-if="this.$login.r.includes('报表配置权限')" @click="saveReport()">新增</button></p>
+        <div style="height: 87%;overflow: auto;width: 104%">
             <div style="padding:3px" :style="{background: index===row ? '#dfedfb' : 'white'}" :class="styles=='2'?'col-sm-6 auto':'col-sm-12 auto'" v-for="(index,type) in types"
                  @click="$dispatch('select-type',index, type),changecolor(index,type)"
                :id="'div-'+index">
-              <div class="row auto"><img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;"></div>
+              <div class="row auto"><img :src="type.f_image_path" alt="图片加载失败" class="img-rounded" style="width: 60px;">
+                <div class="span" style = "float:right;">
+                  <button class="button_search button_spacing right"  v-if="this.$login.r.includes('报表配置权限')" @click="Update()">修改</button>
+                  &nbsp;&nbsp;
+                </div>
+              </div>
               <div style="height:40px" class="row auto">{{index+1}}、{{type.f_report_name}}</div>
             </div>
         </div>
 
       </div>
       <div class="span" v-show="filtrate">
-        <p class="bg-info text-center" style="padding: 8px;" @dblclick="filtrate=!filtrate">相关配置</p>
+        <p class="bg-info text-center" style="padding: 8px;background: #5ac0d9;color: white;border-radius:10px 10px 0 0"  @dblclick="filtrate=!filtrate">相关配置</p>
         <div style="height: 94%;overflow: auto;width: 104%">
+          <div class="row text-primary" style="height: 3%">
+              <!--新增-->
+              <p class="bg-info text-center" style="padding: 8px;font-size: 20px" v-if="saveflag">新增页面</p>
+              <!--修改-->
+            <p class="bg-info text-center" style="padding: 8px;font-size: 20px" v-if="!saveflag">修改页面</p>
+          </div>
           <table style="border-style: none;width: 95%;">
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: left">
-                <label class="font_normal_body">报表名称:</label>
-                <v-select multiple
-                  :value.sync="modelinfo.f_report_name"
-                  class="select_list select"
-                  v-model="modelinfo.f_report_name"
-                  :options='reportNames' placeholder='请选择'
-                  close-on-select></v-select>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: left">
-                <label class="font_normal_body">报表类型:</label>
-                <v-select
-                  :value.sync="modelinfo.f_report_type"
-                  :search="false"
-                  class="select_list select"
-                  v-model="modelinfo.f_report_type"
-                  :options='reportTypes' placeholder='请选择'
-                  close-on-select></v-select>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: left">
-                <label class="font_normal_body">报表状态:</label>
-                <v-select
-                  :value.sync="modelinfo.f_rank"
-                  :search="false"
-                  class="select_list select"
-                  v-model="modelinfo.f_rank"
-                  :options='reportState' placeholder='请选择'
-                  close-on-select></v-select>
-              </td>
-            </tr>
-            <tr style="display:block;margin:15px 0;">
-              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="filtrate=!filtrate">返回</button></td>
-              <td style="text-align: right;width: 25%;"><button class="button_clear  button_spacing" @click="clear()">清空</button></td>
-              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="chaxun()">查询</button></td>
-            </tr>
+
             <tr style="display:block;margin:15px 0;" v-for="(key,value) in infos">
               <td style="text-align: left;">
                 <label class="font_normal_body" style="text-align: right;">{{key}}:</label>
@@ -64,9 +53,12 @@
               </td>
             </tr>
             <tr style="display:block;margin:15px 0;">
-              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="saveOrUpdate(1)">修改</button></td>
-              <td style="text-align: right;width: 25%;"><button class="button_clear  button_spacing" @click="clear(true)">清空</button></td>
-              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
+              <td style="text-align: right;width: 50%;"><button class="button_clear  button_spacing" @click="clear(true)">清空</button></td>
+              <!--修改的保存-->
+              <td style="text-align: right;width: 25%;" v-if="!saveflag"><button class="button_clear  button_spacing"  @click="saveOrUpdate(1)">保存</button></td>
+              <!--新增的保存-->
+              <td style="text-align: left;width: 25%;" v-if="saveflag"><button class="button_search button_spacing" @click="saveOrUpdate(2)">保存</button></td>
+              <td style="text-align: left;width: 25%;"><button class="button_search button_spacing" @click="goback">返回</button></td>
             </tr>
           </table>
         </div>
@@ -86,6 +78,7 @@ export default {
   },
   data () {
     return {
+      saveflag: false,
       types: [],
       row:null,
       infos: {
@@ -139,9 +132,22 @@ export default {
 
       })
     },
+    // 返回
+    goback(){
+      this.chaxun()
+    },
+    // 保存
+    saveReport(){
+      for (let key in this.infos) {
+        this.infos[key] =''
+      }
+      this.saveflag = true
+      this.filtrate = true
+    },
+    // 查询
     chaxun(){
       this.getReportInfo()
-      this.filtrate = !this.filtrate
+      this.filtrate = false
     },
     changecolor(index,type){
       this.row=index
@@ -192,6 +198,7 @@ export default {
       this.reportTypes = typeArr
     },
     Update(){
+      this.saveflag = false
       if (this.$login.r.includes('报表配置权限')) {
         this.filtrate=!this.filtrate
       } else {

package/src/components/sale/businessquery/BusinesQuery.vue

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged >
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
@@ -101,7 +101,8 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>用户编号</nobr>
+                  <!--<nobr>用户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="用户编号" :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
                   <nobr>用户名称</nobr>
@@ -110,7 +111,8 @@
                   <nobr>档案编号</nobr>
                 </th>
                 <th>
-                  <nobr>用户地址</nobr>
+                  <!--<nobr>用户地址</nobr>-->
+                  <data-order field="f_address" name="用户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
                 <th>
                   <nobr>操作类型</nobr>
@@ -122,7 +124,8 @@
                   <nobr>操作状态</nobr>
                 </th>
                 <th>
-                  <nobr>操作日期</nobr>
+                  <!--<nobr>操作日期</nobr>-->
+                  <data-order field="f_operate_date" name="操作日期" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
                 </th>
                 <th>
                   <nobr>付款方式</nobr>
@@ -238,7 +241,7 @@
         data: {},
         other: [],
         footer: [],
-        model: new PagedList('rs/sql/BusinesQuery', 20, {}, {f_money: 0}),
+        model: new PagedList('rs/sql/BusinesQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_money: 0}),
         criteriaShow: false,
         bodyData: ["f_userinfo_code", "f_user_name", "f_money", "f_operat_type","f_state", "f_operate_date", "f_orgname", "f_depname", "f_operator"],
         orgCondtionStr: '',
@@ -248,6 +251,11 @@
         printshow: false,
         all: false,
         fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
         thead: '',
         showupload:false,
         selected:{},
@@ -372,6 +380,24 @@
         })
         this.modelval = sortModel
         console.log('选择的打印的字段', this.modelval)
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
       }
     },
     watch: {
@@ -395,7 +421,7 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
       },
       payments() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]