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/VoucherInquiry.vue

+<style>
+.height_auto.el-select .el-input {
+  height: auto;
+}
+.CommodityType ._addUpload_box {
+  display: block;
+  margin: 10px 0 0;
+}
+.CommodityType ._addUpload_box img {
+  height: 15px;
+  display: block;
+  margin-right: 25px;
+}
+.CommodityType ._addUpload_box > div.el-upload {
+  float: left;
+  width: 138px;
+  height: 92px;
+  border: 1px dashed rgba(210, 210, 210, 1);
+  border-radius: 2px;
+  cursor: pointer;
+  margin-bottom: 10px;
+  padding: 5px;
+  margin-right: 10px;
+  position: relative;
+}
+.CommodityType ._addUpload_box .icon-guanbi1 {
+  font-size: 12px;
+  color: white;
+  display: inline-block;
+  margin-left: 15px;
+  position: absolute;
+  left: 9px;
+  top: -5px;
+  background-color: #f56c6c;
+  border-radius: 50%;
+  height: 15px;
+  width: 15px;
+  text-align: center;
+  line-height: 15px;
+}
+.CommodityType ._addUpload_box > div:hover {
+  background-color: #f5f5f5;
+}
+.CommodityType .el-upload-dragger {
+  font-size: 28px;
+  color: #8c939d;
+  width: 126px;
+  height: 80px;
+  line-height: 41px;
+  text-align: center;
+}
+.CommodityType .bg_color_delete{
+  background-color: #ee4454;
+  border-color: #ee4454;
+}
+.comType_Img{
+  max-height: 50px;
+}
+</style>
+
+<template>
+  <div class="flexOne CommodityType">
+    <div class="query-box">
+      <ul class>
+        <li>
+          <span>
+            <em>名称</em>
+            <el-input v-model="msg.Title"></el-input>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>类型</em>
+            <el-select filterable v-model="msg.SurveyType">
+              <el-option :label="$t('system.ph_buxian')" :value="-1"></el-option>
+              <el-option v-for="item in TypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <span>
+            <em>是否显示</em>
+            <el-select filterable v-model="msg.IsShow">
+              <el-option :label="$t('system.ph_buxian')" :value="-1"></el-option>
+              <el-option label="显示" :value="1" :key="1"></el-option>
+              <el-option label="不显示" :value="0" :key="0"></el-option>
+            </el-select>
+          </span>
+        </li>
+        <li>
+          <input type="button" @click="getList" class="hollowFixedBtn" value="查询">
+          <input
+            type="button"
+            @click="outerVisible = true,dialogTitle='新增', addMsg.reqType = 'add',resetInfo()"
+            class="normalBtn"
+            :value="$t('pub.addBtn')"
+          >
+        </li>
+      </ul>
+    </div>
+
+    <div class="clearfix"></div>
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+      <tr>
+        <th width="600px">问题名称</th>
+        <th>类型</th>
+        <th>排序</th>
+        <th>是否显示</th>
+        <th width="120px">操作</th>
+      </tr>
+      <tr v-for="item in dataList">
+        <td>{{item.Title}}</td>
+        <td>{{getTypeName(item.SurveyType)}}</td>
+        <td>
+           {{item.Sort}}
+        </td>
+        <td>
+           {{item.IsShow === 1 ? '显示' : '不显示'}}
+        </td>
+        <td>
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="$t('active.ld_editInfo')"
+            placement="top"
+          >
+            <el-button
+              type="primary"
+              icon="el-icon-edit"
+              circle
+              @click="outerVisible=true,dialogTitle='修改',updateData(item)"
+            ></el-button>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)"></el-button>
+          </el-tooltip>
+        </td>
+      </tr>
+    </table>
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
+    <el-dialog
+      custom-class="w400"
+      :title="dialogTitle"
+      :visible.sync="outerVisible"
+      center
+      :before-close="closeChangeMachie"
+    >
+      <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
+        <el-form-item label="问题名称" prop="Title">
+          <el-input v-model="addMsg.Title" class="w217"/>
+        </el-form-item>
+        <el-form-item label="问题类型" prop="SurveyType">
+          <el-select filterable v-model="addMsg.SurveyType" @change="changeType(addMsg.SurveyType)">
+            <el-option v-for="item in TypeList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否显示" prop="IsShow">
+          <el-radio v-model="addMsg.IsShow" :label="1">显示</el-radio>
+          <el-radio v-model="addMsg.IsShow" :label="0">不显示</el-radio>
+        </el-form-item>
+        <el-form-item label="排序" prop="Sort">
+          <el-input v-model="addMsg.Sort" class="w217"/>
+        </el-form-item>
+        <template>
+          <div v-if="addMsg.SurveyType === '2' || addMsg.SurveyType === '3'">
+            <template v-for="(item, index) in addMsg.SurveyOptionsList">
+              <el-form-item :label="`选项${index+1}`" >
+                <el-input v-model="item.OptionsName" class="w217">
+                  <el-button @click="deleItem(index)" slot="append" icon="el-icon-delete"></el-button>
+                </el-input>
+              </el-form-item>
+              <el-form-item label="排序" >
+                <el-input v-model="item.Sort" class="w217"/>
+              </el-form-item>
+            </template>
+            <el-form-item label="" >
+              <span @click="addList()">增加</span>
+            </el-form-item>
+          </div>
+        </template>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button
+          class="hollowFixedBtn"
+          @click="outerVisible = false, resetForm('addMsg')"
+        >{{$t('pub.cancelBtn')}}</button> &nbsp;
+        <button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      //请求
+      msg: {
+        pageIndex: 1,
+        pageSize: 15,
+        IsShow: -1,
+        SurveyType: -1,
+        Title: ''
+      },
+      addMsg: {
+        Title: "",
+        SurveyType: '1',
+        IsShow: 1,
+        Sort: 0,
+        SurveyOptionsList: [
+          {
+            OptionsName: '',
+            Sort: 0,
+            ID: 0,
+          }
+        ]
+      },
+      rules: {
+        Title: [
+          { required: true, message: "请输入名称", trigger: "blur" }
+        ],
+        Sort: [
+          { required: true, message: "请输入排序", trigger: "blur" }
+        ]
+      },
+      loading: false,
+      outerVisible: false,
+      dialogTitle: "",
+      dataList: [],
+      TypeList: [],
+    };
+  },
+  mounted() {
+    this.getList();
+    this.getTypeList();
+  },
+  filters: {},
+
+  methods: {
+    // 获取类型名称
+    getTypeName: function (type) {
+      console.log(type)
+      if (type === 1) {
+        return '打分'
+      } else if (type === 2) {
+        return '单选'
+      } else if (type === 3) {
+        return '多选'
+      } else if (type === 4) {
+        return '输入'
+      }
+    },
+    // 切换类型
+    changeType: function (i) {
+      if (i === '1' || i === '4') {
+        this.addMsg.SurveyOptionsList = [
+          {
+            OptionsName: '',
+            Sort: 0,
+            ID: 0,
+          }
+        ]
+      }
+    },
+    // 删除选项
+    deleItem: function (i) {
+      if (this.addMsg.SurveyOptionsList.length) {
+        this.addMsg.SurveyOptionsList.splice(i, 1)
+      }
+    },
+    // 新增选项
+    addList: function () {
+      this.addMsg.SurveyOptionsList.push({
+        OptionsName: '',
+        ID: 0,
+      })
+    },
+    getTypeList: function () {
+      this.apipost('survey_post_GetSurveyTypeEnumList', {}, res=>{
+        if (res.data.resultCode === 1) {
+          this.TypeList = res.data.data
+        }
+      }, null)
+    },
+    // 删除
+    Delete(item) {
+      this.$confirm("是否删除? 删除后不可恢复", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.apipost(
+            "survey_post_DelSurvey",
+            {SurveyID: item.ID },
+            res => {
+              if (res.data.resultCode == 1) {
+                this.Success(res.data.message);
+                this.getList();
+              } else {
+                this.Error(res.data.message);
+              }
+            },
+            err => {}
+          );
+        })
+        .catch(() => {});
+    },
+    //获取数据
+    getList() {
+      this.loading = true;
+      this.apipost(
+        "survey_post_GetPageList",
+        this.msg,
+        res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.dataList = res.data.data.pageData;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    //提交
+    submitForm(addMsg) {
+      //提交创建、修改表单
+      this.$refs[addMsg].validate(valid => {
+        if (valid) {
+          this.addAward();
+        } else {
+          return false;
+        }
+      });
+    },
+    //提交添加
+    addAward() {
+      this.apipost(
+        "survey_post_SetSurvey",
+        this.addMsg,
+        res => {
+          if (res.data.resultCode === 1) {
+            this.Success(res.data.message);
+            this.outerVisible = false;
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    //修改信息
+    updateData(item) {
+      this.outerVisible = true; 
+      this.apipost(
+        "survey_post_GetSurvey",
+        {SurveyID: item.ID},
+        res => {
+          if (res.data.resultCode === 1) {
+            let data = res.data.data
+            data.SurveyType = ''+data.SurveyType
+            this.addMsg = data
+            this.getList();
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+    },
+    //重置信息
+    resetInfo() {
+      var newMsg = {
+        Title: "",
+        SurveyType: "1",
+        IsShow: 1,
+        Sort: 0,
+        SurveyOptionsList: [
+          {
+            OptionsName: '',
+            Sort: 0,
+            ID: 0,
+          }
+        ]
+      };
+      this.addMsg = newMsg;
+    },
+    closeChangeMachie(done) {
+      //弹出框关闭初始化弹框内表单
+      done();
+      this.resetForm("addMsg");
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+};
+</script>
\ No newline at end of file

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',