Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/App.vue

@@ -113,7 +113,7 @@ export default {
 }
 </script>
 <style>
-  @import "//at.alicdn.com/t/font_635492_ea4o8lkzm2b.css";
+  @import "//at.alicdn.com/t/font_635492_ztxwijjubn.css";
   @import "./assets/css/Semibold.css";
   @import "./assets/css/global/config.css";
   @import "./assets/css/fileIcon.css";

src/components/Details.vue

@@ -545,6 +545,9 @@ export default {
           case "/addIntegralMall": //新增商品
           path = "/IntegralMall";
           break;
+          case "/VoucherInquiryAdd": //新增调查
+          path = "/VoucherInquiry";
+          break;
       }
 
       //找到Root
@@ -762,6 +765,9 @@ export default {
           case "/addIntegralMall": //新增商品
           path = "/IntegralMall";
           break;
+           case "/VoucherInquiryAdd": //新增调查
+          path = "/VoucherInquiry";
+          break;
       }
 
       //找到Root

src/components/FinancialModule/FinancialDocuments.vue

@@ -1006,7 +1006,7 @@ export default {
             this.loading= true
             this.checkAllList =[];
             this.checkList = [];
-            if (t) {
+            if (t&&this.BOSSBtn) {
                 this.msg.pageSize = 1000;
             } else {
                 this.msg.pageSize = 6;
@@ -1033,7 +1033,19 @@ export default {
             if(!this.msg.AccountType)this.msg.AccountType=0;
             this.apipost('Financial_post_GetPageList',this.msg,res=>{
                 if(res.data.resultCode == 1) {
-                    let data = res.data.data.pageData;
+                    let data = [];
+                    if(t==1&&this.BOSSBtn&&this.msg.Conditon==3){
+                        let dataList = res.data.data.pageData;
+                        let newData = [];
+                        dataList.forEach(x=>{
+                            if(x.IsBatchAudit==0){
+                                newData.push(x);
+                            }
+                        })
+                        data = newData;
+                    }else{
+                        data = res.data.data.pageData;
+                    }
                     this.total = res.data.data.count;
                     if(this.total==0){
                         this.DataList=[];

src/components/administrative/VoucherInquiryAdd.vue

+<style>
+  .VoucherInquiryAdd{
+    padding: 25px 0;
+    box-sizing: border-box;
+    height: 100%;
+    /* background-color: #ffffff; */
+  }
+  .VoucherInquiryAdd>.el-col.left{
+    box-shadow: 1px 2px 4px -1px #cccccc;
+    transition: all linear .5s;
+    padding-top: 20px;
+    padding-bottom: 20px; 
+  }
+  .VoucherInquiryAdd>.el-col.left:hover{
+    box-shadow: 1px 2px 4px -1px #888888;
+  }
+  .VoucherInquiryAdd>.el-col{
+    height: 100%;
+    
+  }
+  .VoucherInquiryAdd .resource-lititle span{
+    display: block;
+    border-left: 4px solid #e95252;
+    padding-left: 10px;
+    margin-bottom: 20px;
+  }
+  .VoucherInquiryAdd>.el-col .type-item{
+    color: #707070;
+    font-size: 12px;
+    padding: 1px;
+    border: solid 1px #d8d8d8;
+    border-radius: 2px;
+    margin: 0 6px 6px 0;
+    cursor: pointer;
+    padding: 1px 8px;
+    display: flex;
+    align-items: center;
+  }
+  .VoucherInquiryAdd>.el-col .type-item:hover{
+    padding: 0px 8px;
+    border: solid 2px #2672ff;
+    color: #2672ff;
+  }
+  .VoucherInquiryAdd>.el-col .type-item i.iconfont{
+    display: inline-block;
+    margin-right: 5px;
+  }
+</style>
+<template>
+  <el-row class="VoucherInquiryAdd" :gutter="35">
+    <el-col :span="4" class="left">
+      <el-row class="resource-lititle">
+        <span>题目类型：</span>
+      </el-row>
+      <el-row :gutter="5">
+        <el-col :span="12" v-for="(item, index) in typeList" :key="index">
+          <div class="type-item" @click="creatItem(item)">
+            <i class="iconfont" :class="[item.icon]"></i>
+            <span>{{item.name}}</span>
+          </div>
+        </el-col>
+      </el-row>
+    </el-col>
+    <el-col :span="20">
+      <template v-for="(item, index) in list">
+        <Type-Model :itemIndex="itemIndex" :type="type" :itemData="item"/>
+      </template>
+    </el-col>
+  </el-row>
+</template>
+<script>
+import typeModel from './model/typeModel'
+export default {
+  components: {
+    'Type-Model': typeModel,
+  },
+  data() {
+    return {
+      typeList: [
+        {
+          type: 2,
+          icon: 'icon-radio-checked',
+          name: '单选'
+        },
+        {
+          type: 4,
+          icon: 'icon-duoxuan',
+          name: '多选'
+        },
+        {
+          type: 1,
+          icon: 'icon-ge_xingji',
+          name: '评分'
+        },
+        {
+          type: 4,
+          icon: 'icon-shuru',
+          name: '输入'
+        }
+      ],
+      list: [],
+      type: -1,
+      childItem: {}
+    };
+  },
+  mounted() {
+  },
+  methods: {
+    creatItem: function (item) {
+      this.type = item.type
+      this.list.pueh({
+
+      })
+    }
+  }
+};
+</script>

src/components/administrative/model/typeModel.vue

+<style>
+
+</style>
+<template>
+  <div class="model">
+    <!-- "1", "Name":"打分" -->
+    <div v-if="type === 1">
+
+    </div>
+    <!-- "2", "Name":"单选" -->
+    <div v-if="type === 2">
+
+    </div>
+    <!-- "3", "Name":"多选" -->
+    <div v-if="type === 3">
+
+    </div>
+    <!-- "4", "Name":"文本" -->
+    <div v-if="type === 4">
+
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: ['type', 'itemIndex', 'itemData'],
+  data(){
+    return{
+
+    }
+  }
+}
+</script>

src/router/config.js

@@ -390,6 +390,22 @@ export default {
                                 title: '公告管理'
                             },
                         },
+                        {
+                            path: '/VoucherInquiry', //问券调查
+                            name: 'VoucherInquiry',
+                            component: resolve => require(['@/components/administrative/VoucherInquiry'], resolve),
+                            meta: {
+                                title: '问券调查'
+                            },
+                        },
+                        {
+                            path: '/VoucherInquiryAdd', //问券调查添加
+                            name: 'VoucherInquiryAdd',
+                            component: resolve => require(['@/components/administrative/VoucherInquiryAdd'], resolve),
+                            meta: {
+                                title: '问券调查添加'
+                            },
+                        },
                         {
                             path: '/Attendance', //考勤
                             name: 'Attendance',