暂存

src/HManagement/notice/list/modules/edit.vue

@@ -2,18 +2,20 @@
   <div class="inline-16">
     <el-button size="small" type="text" @click="onshow(drawer=true)">详情</el-button>
     <el-drawer
-        title="我是标题"
+        title="编辑"
         :visible.sync="drawer"
         :with-header="false"
         direction="rtl"
         size="90%"
-        append-to-body>
+        append-to-body
+        @close="drawer = false">
       <div class="detail__panel">
         <div class="container normal-panel normal-margin sticky">
-          <el-button v-show="save"  type="warning" size="small"  @click="onSubmit()" >保 存</el-button>
-          <el-button v-show="edit" type="primary" size="small"  @click="onEdit()" >编 辑</el-button>
-          <release v-show="release" class="inline-16" v-if="tool.checkAuth($route.name,'update') && status"  :data="form" @onSuccess="onSuccess"></release>
-          <topping v-show="top" v-if="tool.checkAuth($route.name,'update') && status" :data="form" @onSuccess="onSuccess"></topping>
+<!--          <el-button v-show="save"  type="warning" size="small"  @click="onSubmit()" >保 存</el-button>-->
+          <el-button class="inline-16" v-if="edit" type="primary" size="small"  @click="onEdit()" >编 辑</el-button>
+          <p class="inline-16" v-if="save">编辑</p>
+          <release  class="inline-16" v-if="tool.checkAuth($route.name,'update') && edit"  :data="form" @onSuccess="onSuccess"></release>
+          <topping  class="inline-16" v-if="tool.checkAuth($route.name,'update') && edit" :data="form" @onSuccess="onSuccess"></topping>
         </div>
         <div style="overflow-x:hidden">
           <el-row :gutter="16">
@@ -107,6 +109,10 @@
         </div>
         <!--        <router-view v-if = "drawer"/>-->
       </div>
+      <div class="fixed__btn__panel">
+        <el-button v-show="save" size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button v-show="save" size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
     </el-drawer>
 
   </div>
@@ -138,8 +144,6 @@ export default {
       edit:true,
       save:false,
       status:false,
-      release:true,
-      top:true,
       folderid: JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       rules: {
         title: [
@@ -309,8 +313,6 @@ export default {
     onEdit(){
       this.edit = false
       this.save = true
-      this.release = false
-      this.top = false
     },
     handleCommand(command){
       console.log(command)
@@ -327,6 +329,10 @@ export default {
     onSuccess(){
       this.drawer = false
       this.$emit("updateSuccess")
+    },
+    onClose(){
+      this.save = false
+      this.edit = true
     }
   },
   mounted() {

src/HManagement/notice/list/modules/message.vue

@@ -16,6 +16,15 @@
             idName="sat_noticeid"
             :apiId="{query:20221101095703,del:''}"
         >
+          <template v-slot:tbList="scope">
+            <div v-if="scope.data.column.columnname === 'usertype'">
+              <p v-if="scope.data.column.data.usertype === 1">企业员工</p>
+              <p v-else-if="scope.data.column.data.usertype === 21">经销商</p>
+              <p v-else-if="scope.data.column.data.usertype === 22">经销商员工</p>
+              <p v-else>未知</p>
+            </div>
+            <div >{{scope.data.column.data[scope.data.column.columnname]}}</div>
+          </template>
 
         </basicLayout>
 <!--        <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true">
@@ -49,7 +58,7 @@ export default {
     }
   },
   methods:{
-    async query_message() {
+    /*async query_message() {
       const res = await this.$api.requested({
         "classname": "webmanage.saletool.notice.notice",
         "method": "queryReadRecord",
@@ -58,12 +67,12 @@ export default {
         }
       })
       this.list = res.data
-    }
+    }*/
   },
   mounted () {
   },
   created () {
-    this.tablecols = this.tool.tabelCol(this.$route.name)['tableMessage'].tablecols
+    /*this.tablecols = this.tool.tabelCol(this.$route.name)['tableMessage'].tablecols*/
   }
 }
 

src/HManagement/notice/list/modules/release.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="margin-left: 1%">
+  <div>
 <!--    <el-button type="text" size="mini" @click="releaseNotice">{{data.status === '发布'?'取消发布':'发布'}}</el-button>-->
-    <el-button v-show="release" type="primary" size="small"  @click="open">发布</el-button>
-    <el-button v-show="unRelease" type="primary" size="small"  @click="unOpen">取消发布</el-button>
+    <el-button v-show="release" type="primary" plain size="small"  @click="open">发布</el-button>
+    <el-button v-show="unRelease" type="primary" plain size="small"  @click="unOpen">取消发布</el-button>
   </div>
 </template>
 

src/HManagement/notice/list/modules/tp.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="inline-16">
+  <div >
 <!--    <el-button type="text" size="mini" @click="releaseNotice">{{data.isontop === 0?'置顶':'取消置顶'}}</el-button>-->
-    <el-button v-show="top" type="primary" size="small"  @click="open">置顶</el-button>
-    <el-button v-show="unTop" type="primary" size="small"  @click="unOpen">取消置顶</el-button>
+    <el-button v-show="top" type="primary" size="small" plain @click="open">置顶</el-button>
+    <el-button v-show="unTop" type="primary" size="small" plain  @click="unOpen">取消置顶</el-button>
   </div>
 </template>
 

src/HManagement/submit/index.vue

@@ -1,6 +1,19 @@
 <template>
   <div>
-    <list ref="list">
+    <basicLayout
+        ref="list"
+        :oldFormPath="{add:'HManagement/submit/list/modules'}"
+        tableName="tableSubmitlist"
+        idName="sat_submiteditmodelid"
+        :apiId="{query:20221102093602,del:20221102094102}"
+    >
+      <template v-slot:tbList="scope">
+        <div>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+    </basicLayout>
+<!--    <list ref="list">
       <el-button slot="add" icon="el-icon-plus" type="primary" size="small" @click="$router.push({path:'/submit_add'})">新 增</el-button>
       <template v-if="tool.checkAuth($route.name,'read')" v-slot:detail="scope">
         <el-button class="inline-16" type="text" size="mini" @click="$router.push({path:'/submit_detail',query:{id:scope.data.data.sat_submiteditmodelid}})">明 细</el-button>
@@ -18,7 +31,7 @@
       <template v-if="tool.checkAuth($route.name,'delete')" v-slot:del="scope">
         <on-del class="inline-16" :data="scope.data.data" @onSuccess="onSuccess"></on-del>
       </template>
-    </list>
+    </list>-->
   </div>
 </template>
 

src/HManagement/submit/indexCopy.vue

@@ -0,0 +1,45 @@
+<template>
+  <div>
+    <list ref="list">
+      <el-button slot="add" icon="el-icon-plus" type="primary" size="small" @click="$router.push({path:'/submit_add'})">新 增</el-button>
+      <template v-if="tool.checkAuth($route.name,'read')" v-slot:detail="scope">
+        <el-button class="inline-16" type="text" size="mini" @click="$router.push({path:'/submit_detail',query:{id:scope.data.data.sat_submiteditmodelid}})">明 细</el-button>
+      </template>
+      <template v-if="tool.checkAuth($route.name,'update')" v-slot:edit="scope">
+        <el-button class="inline-16" style="margin-left:0 !important;" type="text" size="mini" @click="$router.push({path:'/submit_edit',query:{id:scope.data.data.sat_submiteditmodelid}})">编 辑</el-button>
+      </template>
+      <template v-if="tool.checkAuth($route.name,'update')" v-slot:release="scope">
+        <release :data="scope.data.data" @onSuccess="onSuccess"></release>
+      </template>
+      <template v-if="tool.checkAuth($route.name,'update')" v-slot:data_statistics="scope">
+        <el-button type="text" size="mini" class="inline-16" @click="$router.push({path:'/submit_statistics',query:{id:scope.data.data.sat_submiteditmodelid}})">数据分析</el-button>
+      </template>
+      
+      <template v-if="tool.checkAuth($route.name,'delete')" v-slot:del="scope">
+        <on-del class="inline-16" :data="scope.data.data" @onSuccess="onSuccess"></on-del>
+      </template>
+    </list>
+  </div>
+</template>
+
+<script>
+import list from './list/list.vue'
+import onDel from './list/modules/delete.vue'
+import release from './list/modules/release.vue'
+
+export default {
+  components:{
+    list,
+    onDel,
+    release
+  },
+  methods:{
+    onSuccess () {
+      this.$refs.list.listData()
+    }
+  }
+}
+
+</script>
+<style>
+</style>

src/HManagement/submit/list/list.vue

@@ -46,8 +46,9 @@ export default {
   data() {
     return {
       params: {
-        "classname": "webmanage.saletool.submitedit.submitedit",
-        "method": "selectsubmitlist",
+        /*"classname": "webmanage.saletool.submitedit.submitedit",
+        "method": "selectsubmitlist",*/
+        "id":"20221102093602",
         "content": {
           "pageNumber": 1,
           "pageSize": 10,

src/HManagement/submit/list/modules/add.vue

@@ -0,0 +1,65 @@
+<template>
+  <div>
+<!--    <p>创建提报中....</p>-->
+    <el-button size="small" type="primary"  @click="onshow(drawer=true)">新 增</el-button>
+    <el-drawer
+        title="我是标题"
+        :visible.sync="drawer"
+        :with-header="false"
+        :wrapper-closable="false"
+        direction="rtl"
+        size="90%"
+        append-to-body>
+      <div class="detail__panel">
+
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  components: {
+  },
+  data() {
+    return {
+      drawer:false,
+      defaultData: {},
+      folderid: JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+      form: {
+        "title": "",
+        "notes": '初始化数据' + JSON.parse(sessionStorage.getItem('active_account')).userid,
+        "istextrequired": 1,
+        "isattrequired": 1,
+        "onceonly": 1,
+        "sat_submiteditmodelid": "0",
+        "begdate": (new Date()).toLocaleDateString(),
+        "enddate": (new Date()).toLocaleDateString()
+      }
+    }
+  },
+  methods: {
+    onChecked() { },
+    async onSubmit() {
+      const res = await this.$api.requested({
+        /*"classname": "webmanage.saletool.submitedit.submitedit",
+        "method": "insertorupdate",*/
+        "id":"20221102093702",
+        "content": this.form
+      })
+      res.code === 1 ? this.$router.push({ path: '/submit_add', query: { id: res.data.sat_submiteditmodelid } }) : ''
+    },
+    onshow(){
+      this.drawer = false
+      this.onSubmit()
+    }
+
+  },
+  mounted() {
+   /* this.onSubmit()*/
+  }
+}
+
+</script>
+<style>
+</style>

src/HManagement/submit/list/modules/submit_add.vue

@@ -1,44 +1,308 @@
 <template>
   <div>
-    <p>创建提报中....</p>
+    <el-drawer
+        title="创建用户"
+        :visible.sync="drawer"
+        size="90%"
+        direction="rtl"
+        append-to-body
+        :wrapper-closable="false"
+        >
+      <div class="drawer__panel">
+        <el-row :gutter="16">
+          <el-col :span="13">
+            <div class="container normal-panel normal-margin">
+              <p class="normal-title normal-margin">提报设置</p>
+              <el-row :gutter="16">
+                <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="left" size="small">
+                  <el-col :span="24">
+                    <el-form-item label="标题" prop="title">
+                      <el-input v-model="form.title" placeholder="标题"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="提报类型" prop="onceonly">
+                      <el-select v-model="form.onceonly" placeholder="选择提报类型">
+                        <el-option label="一事一报" :value="1"></el-option>
+                        <el-option label="一事多报" :value="0"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="生效日期" prop="begdate">
+                      <el-date-picker style="width:100%" v-model="form.begdate" value-format="yyyy-MM-dd" type="date"
+                                      placeholder="生效日期">
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="截止日期" prop="enddate">
+                      <el-date-picker style="width:100%" v-model="form.enddate" value-format="yyyy-MM-dd" type="date"
+                                      placeholder="截止日期">
+                      </el-date-picker>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="提报要求" prop="notes">
+                      <el-input v-model="form.notes" placeholder="提报要求"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="提报形式" prop="type">
+                      <el-checkbox-group v-model="form.type" @change="onCheckboxChange">
+                        <el-checkbox label="附件提报" name="isattrequired"></el-checkbox>
+                        <el-checkbox label="文字提报" name="istextrequired"></el-checkbox>
+                      </el-checkbox-group>
+<!--                      &lt;!&ndash; <el-checkbox :true-label="1" :false-label="0" v-model="form.isattrequired">附件提报</el-checkbox>
+                      <el-checkbox :true-label="1" :false-label="0" v-model="form.istextrequired">文字提报</el-checkbox> &ndash;&gt;-->
+                    </el-form-item>
+                  </el-col>
+                </el-form>
+              </el-row>
+            </div>
+            <div class="container normal-panel normal-margin">
+              <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain" :onlyread="store.state.pageOnlyRead">
+                <upload slot="upload" :folderid="folderid"
+                        :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: form.sat_submiteditmodelid, usetype: 'default' }"
+                        @onSuccess="onSubmit()"></upload>
+              </attachmentList>
+            </div>
+          </el-col>
+          <el-col :span="11">
+            <scopeOfauth :defaultData="defaultData" appidname="sat_submiteditmodelid" obiectName="sat_submiteditmodel" :dataid="$route.query.id"
+                         @onChecked="onChecked"></scopeOfauth>
+          </el-col>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onclose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+<!--    <div class="container normal-panel normal-margin">
+      <el-button type="warning" size="small" icon="el-icon-s-claim" @click="onSubmit((res)=>tool.showMessage(res))">保 存
+      </el-button>
+    </div>
+    <div style="overflow-x:hidden">
+      <el-row :gutter="16">
+        <el-col :span="13">
+          <div class="container normal-panel normal-margin">
+            <p class="normal-title normal-margin">提报设置</p>
+            <el-row :gutter="16">
+              <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="left" size="small">
+                <el-col :span="24">
+                  <el-form-item label="标题" prop="title">
+                    <el-input v-model="form.title" placeholder="标题"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="提报类型" prop="onceonly">
+                    <el-select v-model="form.onceonly" placeholder="选择提报类型">
+                      <el-option label="一事一报" :value="1"></el-option>
+                      <el-option label="一事多报" :value="0"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="生效日期" prop="begdate">
+                    <el-date-picker style="width:100%" v-model="form.begdate" value-format="yyyy-MM-dd" type="date"
+                      placeholder="生效日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="截止日期" prop="enddate">
+                    <el-date-picker style="width:100%" v-model="form.enddate" value-format="yyyy-MM-dd" type="date"
+                      placeholder="截止日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="提报要求" prop="notes">
+                    <el-input v-model="form.notes" placeholder="提报要求"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="提报形式" prop="type">
+                    <el-checkbox-group v-model="form.type" @change="onCheckboxChange">
+                      <el-checkbox label="附件提报" name="isattrequired"></el-checkbox>
+                      <el-checkbox label="文字提报" name="istextrequired"></el-checkbox>
+                    </el-checkbox-group>
+                    &lt;!&ndash; <el-checkbox :true-label="1" :false-label="0" v-model="form.isattrequired">附件提报</el-checkbox>
+                    <el-checkbox :true-label="1" :false-label="0" v-model="form.istextrequired">文字提报</el-checkbox> &ndash;&gt;
+                  </el-form-item>
+                </el-col>
+              </el-form>
+            </el-row>
+          </div>
+          <div class="container normal-panel normal-margin">
+            <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain" :onlyread="store.state.pageOnlyRead">
+              <upload slot="upload" :folderid="folderid"
+                :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: form.sat_submiteditmodelid, usetype: 'default' }"
+                @onSuccess="onSubmit()"></upload>
+            </attachmentList>
+          </div>
+        </el-col>
+        <el-col :span="11">
+          <scopeOfauth :defaultData="defaultData" appidname="sat_submiteditmodelid" obiectName="sat_submiteditmodel" :dataid="$route.query.id"
+            @onChecked="onChecked"></scopeOfauth>
+        </el-col>
+      </el-row>
+    </div>-->
   </div>
 </template>
 
 <script>
+import attachmentList from '@/components/attachment_list/index.vue'
+import upload from '@/components/upload/hw_obs_upload.vue'
+import scopeOfauth from '@/components/scopeOfAuthority/index.vue'
+import store from '@/store'
 export default {
   components: {
+    attachmentList,
+    upload,
+    scopeOfauth
   },
   data() {
     return {
-      defaultData: {},
+      drawer:false,
+      store,
       folderid: JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+      defaultData: {},
+      rules: {
+        title: [
+          { required: true, message: '请输入课程名称', trigger: 'blur' },
+        ],
+        begdate: [
+          { required: true, message: '请选择生效日期', trigger: 'change' }
+        ],
+        enddate: [
+          { required: true, message: '请选择截止日期', trigger: 'change' }
+        ],
+        onceonly: [
+          { required: true, message: '请选择版块', trigger: 'change' }
+        ],
+        notes: [
+          { required: true, message: '请输入提报要求', trigger: 'blur' },
+        ],
+        type: [
+          { type: 'array', required: true, message: '请至少选择一个提报形式', trigger: 'change' }
+        ],
+      },
       form: {
         "title": "",
-        "notes": '初始化数据' + JSON.parse(sessionStorage.getItem('active_account')).userid,
+        "notes": "",
         "istextrequired": 1,
         "isattrequired": 1,
         "onceonly": 1,
         "sat_submiteditmodelid": "0",
-        "begdate": (new Date()).toLocaleDateString(),
-        "enddate": (new Date()).toLocaleDateString()
+        "begdate": "",
+        "enddate": "",
+        "type": []
       }
     }
   },
   methods: {
-    onChecked() { },
-    async onSubmit() {
+    async querySubmitMain() {
       const res = await this.$api.requested({
-        "classname": "webmanage.saletool.submitedit.submitedit",
-        "method": "insertorupdate",
-        "content": this.form
+        /*"classname": "webmanage.saletool.submitedit.submitedit",
+        "method": "select_submitdetailed",*/
+        "id":"20221102093602",
+        "content": {
+          "sat_submiteditmodelid": this.$route.query.id
+        }
+      })
+      res.data.notes == '初始化数据' + JSON.parse(sessionStorage.getItem('active_account')).userid ? res.data.notes = '' : '';
+      this.form = Object.assign({}, this.form, res.data)
+      if (this.form.isattrequired === 1) { this.form.type.push('附件提报') }
+      if (this.form.istextrequired === 1) { this.form.type.push('文字提报') }
+
+      this.form.status !== '新建' ? store.state.pageOnlyRead = true : store.state.pageOnlyRead = false
+    },
+    onSubmit(callback) {
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false;
+        const res = await this.$api.requested({
+          /*"classname": "webmanage.saletool.submitedit.submitedit",
+          "method": "insertorupdate",*/
+          "id":20221102093702,
+          "content": this.form
+        })
+        this.insertCoursewareauth()
+        callback?callback(res):''
+        this.drawer = false
+        this.$router.go(-1)
       })
-      res.code === 1 ? this.$router.replace({ path: '/submit_edit', query: { id: res.data.sat_submiteditmodelid } }) : ''
     },
+    // 监听提报形式
+    onCheckboxChange(val) {
+      this.form.isattrequired = val.indexOf('附件提报') === -1 ? 0 : 1
+      this.form.istextrequired = val.indexOf('文字提报') === -1 ? 0 : 1
+    },
+    // 获取保存授权范围数据
+    onChecked(param) {
+      this.authData = param
+      console.log("授权数据")
+      console.log(this.authData)
+    },
+    // 新增授权范围
+    async insertCoursewareauth() {
+      const res = await this.$api.requested({
+        /*"classname": "webmanage.saletool.submitedit.submiteditauth",
+        "method": "insertOrUpdate",*/
+        "id":"20221102094402",
+        "content": this.authData
+      })
+      res.code === 0 ? this.$notify({
+        title: '失败',
+        message: res.data,
+        type: 'error'
+      }) : this.querySubmitMain()
+
+    },
+    // 查询授权信息
+    async query_auth() {
+      console.log("查询授权信息")
+      const res = await this.$api.requested({
+        /*"classname": "webmanage.saletool.submitedit.submiteditauth",
+        "method": "selectAuth",*/
+        "id":'20221102094602',
+        "content": {
+          "sat_submiteditmodelid": this.$route.query.id
+        }
+      })
+      this.defaultData = res.data
+    },
+    async onclose(){
+      this.drawer = false
+      const res = this.$api.requested({
+        "id": 20221102094102,
+        "content": {
+          "sat_submiteditmodelids":[this.$route.query.id]
+        }
+      })
+      this.$router.go(-1)
+    }
 
   },
   mounted() {
-    this.onSubmit()
-  }
+    /*this.drawer = true*/
+    console.log("输出")
+    console.log(this.$route.query.id)
+    if (this.$route.query.id !== ''){
+      this.drawer = true
+     /* this.querySubmitMain()
+      this.query_auth()*/
+      /*this.query_auth()*/
+    }
+  },
+  created() {
+    console.log("输出")
+    console.log(this.$route.query.id)
+    /*this.drawer = true*/
+    /*this.querySubmitMain()
+    this.query_auth()*/
+  },
 }
 
 </script>

src/router/HManagement.js

@@ -209,7 +209,7 @@ const HManagement = [
     path: '/submit_mag',
     name: 'submit_mag',
     meta: {
-      title: '提报管理',
+      title: '提报发布',
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/index.vue')
@@ -217,15 +217,15 @@ const HManagement = [
     path: '/submit_add',
     name: 'submit_mag',
     meta: {
-      title: '提报管理',
+      title: '提报新增',
       ast_nav: true
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_add.vue')
+    component: () => import(/* webpackChunkName: "about" */ '@/HManagement/submit/list/modules/submit_add')
   }, {
     path: '/submit_edit',
     name: 'submit_mag',
     meta: {
-      title: '提报管理',
+      title: '提报编辑',
       ast_nav: true,
       keeproute: true
     },