2022-12-17 10:00

src/HDrpManagement/writeoffbill/components/add.vue

@@ -37,7 +37,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="订单">
-                <selectOrder ref="table" :layout="tablecols" :data="orderList" :custom="true" height="500px">
+                <selectOrder v-if="dialogFormVisible" ref="table" idName="sa_orderitemsid" :layout="tablecols" :data="orderList" :custom="true" height="500px">
                   <template v-slot:customcol="scope">
                       <div>{{scope.column.data[scope.column.columnname]}}</div>
                   </template>
@@ -126,8 +126,14 @@ export default {
   watch: {
     dialogFormVisible (val) {
       if(!val) {
+        console.log('触发');
+        
         this.$refs.ent.form.enterprisename = ''
         this.$refs.form.resetFields()
+        this.$refs.table.allArr = []
+        this.orderList = []
+        this.$refs.voucher.form.billno = ''
+        this.form.sa_cashbillid = ''
       }
     }
   },

src/HDrpManagement/writeoffbill/modules/order/addOrder.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="drawer__panel">
         <el-input style="width:250px;margin-bottom:10px" size="small" placeholder="请输入搜索内容" clearable @clear="getOrderList(params.content.pageNumber=1)" v-model="params.content.where.condition" @keyup.enter.native="getOrderList(params.content.pageNumber=1)"></el-input>
-        <selectOrder v-if="dialogFormVisible" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
+        <selectOrder v-if="dialogFormVisible" idName="sa_orderitemsid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
           <template v-slot:customcol="scope">
               <div>{{scope.column.data[scope.column.columnname]}}</div>
           </template>
@@ -97,8 +97,6 @@ export default {
           writeoffbillOrder:result
         }
       })
-      console.log(res,'新增结果');
-      
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
         this.dialogFormVisible = false

src/HDrpManagement/writeoffbill/modules/order/selectOrder.vue

@@ -48,7 +48,7 @@ export default {
       
       this.data.forEach((row) => {
         this.allArr.forEach(item => {
-          if (row.sa_orderitemsid == item.sa_orderitemsid) {
+          if (row[this.idName] == item[this.idName]) {
             this.$nextTick(() => {
               this.$refs["tables"].toggleRowSelection(row, true);
             })
@@ -62,7 +62,7 @@ export default {
   },
   methods:{
     aaaa(e,a) {
-      let index = this.allArr.findIndex(v=>v.sa_orderitemsid == a.sa_orderitemsid)
+      let index = this.allArr.findIndex(v=>v[this.idName] == a[this.idName])
       if(index == -1) {
         this.allArr.push(a)
       } else {
@@ -78,7 +78,7 @@ export default {
         })
       } else {
         val.forEach(item => {
-          let res = this.allArr.every(item2 => item.sa_orderitemsid != item2.sa_orderitemsid)
+          let res = this.allArr.every(item2 => item[this.idName] != item2[this.idName])
           res ? this.allArr.push(item) : ''
         })
       }

src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -27,7 +27,7 @@
             @change="cascaderChange">
           </el-cascader>
           </el-form-item>
-          <el-form-item label="市场活动" prop="sat_campaignid">
+          <!-- <el-form-item label="市场活动" prop="sat_campaignid">
             <el-popover
               placement="bottom"
               trigger="manual"
@@ -36,7 +36,7 @@
               <selectActivity ref="member" :radio="true" @onSelect="centerChange" @onCancel="activityVisible = false"></selectActivity>
               <el-input readonly type="text" slot="reference" size="small" @focus="activityVisible=true" v-model="form.campaign_name"></el-input>
             </el-popover>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="地址" prop="address">
             <el-input v-model="form.address" placeholder="请输入地址"></el-input>
           </el-form-item>

src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -27,7 +27,7 @@
             @change="cascaderChange">
           </el-cascader>
           </el-form-item>
-          <el-form-item label="市场活动" prop="sat_campaignid">
+          <!-- <el-form-item label="市场活动" prop="sat_campaignid">
             <el-popover
               placement="bottom"
               trigger="manual"
@@ -36,7 +36,7 @@
               <selectActivity ref="member" :radio="true" @onSelect="centerChange" @onCancel="activityVisible = false"></selectActivity>
               <el-input readonly type="text" slot="reference" size="small" @focus="activityVisible=true" v-model="form.campaign_name"></el-input>
             </el-popover>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="地址" prop="address">
             <el-input v-model="form.address" placeholder="请输入地址"></el-input>
           </el-form-item>

src/HManagement/siteManage/custom_option/modules/add.vue

@@ -15,7 +15,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="20">
-              <el-form-item  label="描述:">
+              <el-form-item  label="描述:" prop="remarks">
                 <el-input type="text" autosize v-model="form.remarks" placeholder="输入描述"></el-input>
               </el-form-item>
             </el-col>

src/HManagement/siteManage/vacation/index.vue

@@ -0,0 +1,75 @@
+
+<template>
+  <div>
+    <basicLayout 
+      ref="basicLayout" 
+      :oldFormPath="{
+        add:''
+      }"
+      tableName="vacationTable" 
+      idName="sa_writeoffbillid" 
+      :apiId="{query:20221215165504,del:20221124090304}"
+      :options="options"
+      :detailPath="{
+        path:'/writeoffbillDetail'
+      }"
+      @listData="listData"
+      @listCreate="listCreate">
+      <div slot="custom">
+        <div class="label_center">
+          <p class="search__label">范围:</p>
+          <el-select v-model="isnext" style="margin-right:10px" size="small" placeholder="请选择范围" @change="areaChange">
+            <el-option label="今年" value="0"></el-option>
+            <el-option label="明年" value="1"></el-option>
+          </el-select>
+        </div>
+      </div>
+      <template v-slot:tbList="scope">
+        <div>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+        <div v-if="!scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0">--</div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+export default {
+  data () {
+    return {
+      options:[],
+      isnext:'0'
+      
+    }
+  },
+  methods:{
+    listData (data) {
+      console.log(data);
+      
+    },
+    listCreate (param) {
+      console.log('触发');
+      
+      param.content.isnext = 0
+    },
+    async areaChange () {
+      this.$refs.basicLayout.param.content.isnext=this.isnext
+      this.$refs.basicLayout.param.content.pageNumber=1
+      let res = await this.$api.requested({
+        "id": 20221214094904,
+        "content": {
+            "isnext": this.isnext //0今年，1明年
+        }
+      })
+      this.$refs.basicLayout.listData()
+    }
+  }
+}
+
+</script>
+<style>
+</style>

src/components/normal-basic-layout/index.vue

@@ -271,11 +271,11 @@ export default {
     this.autoQuery === false?'':this.listData()
   },
   created () {
+    this.$emit('listCreate',this.param)
     try {
       this.routerName = this.$route.meta.title
       this.layout = this.tool.tabelCol(this.$route.name)[this.tableName].tablecols
       this.tableLayout = this.layout
-      this.$emit('listCreate',this.param)
       this.getSystemAppid()
     } catch (error) {
       

src/router/HManagement.js

@@ -398,6 +398,14 @@ const HManagement = [
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/messageSendtype/index.vue')
+  },{
+    path: '/vacation',
+    name: 'vacation',
+    meta: {
+      title: '节假日管理',
+      ast_nav: true
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/siteManage/vacation/index')
   }, {
     path: '/clue_import',
     name: 'orderclueupload',