shengbingg vor 1 Jahr
Ursprung
Commit
29d6f25864

+ 85 - 26
src/pages/main/terminals/advchecks.vue

@@ -4,13 +4,27 @@
       <toolList @iconCli="iconCli" :tooltit="tooltit"></toolList>
       <div class="search">
         <el-select v-model="advstatus" @change="advchange">
-          <el-option v-for="items in advopt" :key="items.id" :label="items.name" :value="items.id">
+          <el-option
+            v-for="items in advopt"
+            :key="items.id"
+            :label="items.name"
+            :value="items.id"
+          >
           </el-option>
         </el-select>
       </div>
       <div class="tabbox">
-        <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
-          tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
+        <el-table
+          height="calc(100% - 40px)"
+          class="com-table"
+          ref="multipleTable"
+          :data="tableData"
+          tooltip-effect="dark"
+          size="small"
+          border
+          style="width: 100%"
+          v-loading="loading"
+        >
           <el-table-column prop="process_id" label="工单编号">
           </el-table-column>
           <el-table-column prop="need_name" label="工单标题"> </el-table-column>
@@ -22,9 +36,19 @@
           <el-table-column prop="taskName" label="状态"> </el-table-column>
           <el-table-column label="操作" width="120px" align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="primary" @click="dialogCheck(scope.row, 1)">查看</el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                @click="dialogCheck(scope.row, 1)"
+                >查看</el-button
+              >
               <!--<el-button size="mini" type="danger" v-if="scope.row.sts==3"-->
-              <el-button size="mini" v-if="scope.row.status === '1'" type="danger" @click="dialogCheck(scope.row, 2)">审核
+              <el-button
+                size="mini"
+                v-if="scope.row.status === '1'"
+                type="danger"
+                @click="dialogCheck(scope.row, 2)"
+                >审核
               </el-button>
               <!-- <el-button
                 v-if="
@@ -38,12 +62,24 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
-          :total="total">
+        <el-pagination
+          class="pageBox"
+          @current-change="currchange"
+          layout="prev, pager, next"
+          background
+          :total="total"
+        >
         </el-pagination>
       </div>
-      <el-dialog title="广告管理" v-if="dialogStatus" :visible.sync="dialogStatus" width="80%" :destroy-on-close="true"
-        :modal-append-to-body="false" :close-on-click-modal="false">
+      <el-dialog
+        title="广告管理"
+        v-if="dialogStatus"
+        :visible.sync="dialogStatus"
+        width="80%"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
         <div>
           <advert
             v-if="typestatsu === 2"
@@ -56,8 +92,14 @@
         </div>
       </el-dialog>
 
-      <el-dialog title="定稿素材" :visible.sync="dialogStatusc" width="50%" :destroy-on-close="true"
-        :modal-append-to-body="false" :close-on-click-modal="false">
+      <el-dialog
+        title="定稿素材"
+        :visible.sync="dialogStatusc"
+        width="50%"
+        :destroy-on-close="true"
+        :modal-append-to-body="false"
+        :close-on-click-modal="false"
+      >
         <!-- <el-form>
                     <el-form-item class="info-line online">
                         <span>素材类型</span>
@@ -94,8 +136,8 @@ export default {
   },
   data() {
     return {
-      draftStatus:true,
-      clickStatus:"",
+      draftStatus: true,
+      clickStatus: "",
       tooltit: "广告管理",
       auditStatus: false,
       fullscreen: false,
@@ -148,11 +190,17 @@ export default {
   },
   methods: {
     //我的待办
-    getQueryList() {
+    getQueryList(e) {
       let list = {
         tableName: this.tableName,
       };
+      if (e.id) {
+        list.taskId = e.id;
+      }
       getTodoBase(this.pageSize, "", list).then((res) => {
+        if (e.id) {
+          this.dialogCheck(res.data.data[0], 2);
+        }
         this.tableData = res.data.data;
         this.tableData.map((item) => {
           item.status = "1";
@@ -299,11 +347,11 @@ export default {
     //获取列表
     getList(e) {
       console.log(e);
-      switch (e) {
+      switch (e.type) {
         //我的待办
         case "0":
           this.auditStatus = true;
-          this.getQueryList();
+          this.getQueryList(e);
           break;
         //我的已办
         case "1":
@@ -411,19 +459,18 @@ export default {
       this.getList(this.clickStatus);
     },
     advchange(e) {
-      this.total = 0
-      this.pageSize = 1
-      this.clickStatus = e
+      this.total = 0;
+      this.pageSize = 1;
+      this.clickStatus = e;
       this.getList(this.clickStatus);
     },
     //处理申请
     dialogCheck(n, v) {
-
       if (v == 1) {
         this.changeinfo = false;
-        this.saveStatus = false
+        this.saveStatus = false;
       } else {
-        if(n.taskName == "科室经理审批"){
+        if (n.taskName == "起草") {
           this.draftStatus = false;
         }
         this.changeinfo = true;
@@ -541,14 +588,26 @@ export default {
   },
   mounted() {
     this.userInfo = JSON.parse(window.sessionStorage.userInfo);
-    this.advstatus = String(this.$route.query.type);
-    this.clickStatus = this.$route.query.type;
-    this.getList(this.advstatus);
+    console.log(this.$route.query);
+    if (this.$route.query.id) {
+      this.advstatus = "0";
+      this.clickStatus = "0";
+      this.getList({
+        id: this.$route.query.id,
+        type: "0",
+      });
+    } else {
+      this.advstatus = String(this.$route.query.type);
+      this.clickStatus = this.$route.query.type;
+      this.getList({
+        type: this.advstatus,
+      });
+    }
 
     this.ctrlbtn();
     this.gettype();
   },
-  created() { },
+  created() {},
 };
 </script>
 <style scoped lang="scss">

+ 63 - 27
src/pages/main/terminals/advertincreases.vue

@@ -420,9 +420,11 @@ export default {
       materTypeopt: [],
       attList: [],
       fileInfo: {
-        type: "img",
+        // type: "img",
+        type: "bt1n",
         limit: 50,
-        url: "/market/ggsj/upload",
+        // url: "/market/ggsj/upload",
+        url: "/market/waf/uploadByMinio",
         fileList: [],
       },
       checkList: [],
@@ -441,15 +443,17 @@ export default {
       request_form: {
         userId: "",
         userName: "",
-        path: this.$router.currentRoute.name,
+        // path: this.$router.currentRoute.name,
+        path: 'advchecks',
         userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
         title: "",
         businessKey: "",
         processDefinitionKey: "ggsj_process",
       },
       requestForm: {
-          fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
-        // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
+          fresourceId: "7f3e39a2-ed7e-11ed-8138-e00084564cce", //线上环境
+        
+        // fresourceId: "3886c339-ebe4-11ed-997f-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00",//本地环境
         processDefinitionKey: "ggsj_process",
       },
@@ -485,22 +489,54 @@ export default {
         });
       }
     },
-    getUserIds() {
-      this.$http({
-        url: "/market/waf/queryRoleByName",
+    // getUserIds() {
+    //   // console.log(this.infolist.need_name)
+    //   this.$http({
+    //     url: "/market/waf/queryRoleByName",
+    //     method: "post",
+    //     headers: {
+    //       "Content-Type": "application/json",
+    //     },
+    //     data: {
+    //       userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
+    //     },
+    //   }).then((res) => {
+    //     this.request_form.title = this.infolist.need_name;
+    //     this.request_form.userName = res.data.data.rows[0].name;
+    //     this.request_form.userId = res.data.data.rows[0].userCode;
+    //   });
+    // },
+     //获取userID
+       getUserIds() {
+        let id = JSON.parse(window.sessionStorage.userInfo).loginNo
+        this.$http({
+        url: "/market//api/user/info/queryNodePers?params="+ id,
         method: "post",
         headers: {
-          "Content-Type": "application/json",
+         "Content-Type": "application/json",
         },
-        data: {
-          userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
+         data: {
+          // params: JSON.parse(window.sessionStorage.userInfo).loginNo,
+       },
+      }).then((res) => {
+        this.request_form.userName = res.data[0].children[0].loginNameStr;
+        this.request_form.userId = res.data[0].children[0].loginNoStr;
+        this.request_form.title = '[市场工作台]-'+'广告设计及素材库-'+ this.$refs.infolist.model.need_name;
+        this.$http({
+        url: "/market/ggsj/add",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
         },
+        data: this.infolist,
       }).then((res) => {
-        this.request_form.title = this.userInfo.need_name;
-        this.request_form.userName = res.data.data.rows[0].name;
-        this.request_form.userId = res.data.data.rows[0].userCode;
+        this.request_form.businessKey = res.data.body;
+        this.clickHandle(res.data.body);
+        this.$message.success('保存成功')
       });
-    },
+        
+       });
+     },
     //保存工单启动工作流
     clickSave() {
       if (this.spreadchannelzList !== []) {
@@ -513,18 +549,18 @@ export default {
         this.infolist.mkFileShareAttachList = this.attList;
       }
       this.getUserIds();
-      this.$http({
-        url: "/market/ggsj/add",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        data: this.infolist,
-      }).then((res) => {
-        this.request_form.businessKey = res.data.body;
-        this.clickHandle(res.data.body);
-        this.$message.success('保存成功')
-      });
+      // this.$http({
+      //   url: "/market/ggsj/add",
+      //   method: "post",
+      //   headers: {
+      //     "Content-Type": "application/json",
+      //   },
+      //   data: this.infolist,
+      // }).then((res) => {
+      //   this.request_form.businessKey = res.data.body;
+      //   this.clickHandle(res.data.body);
+      //   this.$message.success('保存成功')
+      // });
     },
     async clickHandle(e) {
       let _this = this;

+ 10 - 7
src/pages/main/terminals/components/adverts.vue

@@ -238,8 +238,9 @@ export default {
       // draftStatus:'',//起草状态更改表单状态
       uploadDownStatus: false,
       requestForm: {
-        fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
-        // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
+        fresourceId: "7f3e39a2-ed7e-11ed-8138-e00084564cce", //线上环境
+       
+        // fresourceId: "3886c339-ebe4-11ed-997f-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00", //本地环境
         processDefinitionKey: "ggsj_process",
       },
@@ -285,13 +286,15 @@ export default {
       terminalopt: [],
       materTypeopt: [],
       datalist: {
-        url: "/bpm/api/download",
+        // url: "/bpm/api/download",
+        url: "/market/waf/downFileByMinio",
         type: 1,
       },
       fileInfo: {
-        type: "img",
+        // type: "img",
+        type: "bt1n",
         limit: 50,
-        url: "/market/ggsj/upload",
+        url: "/market/waf/uploadByMinio",
         fileList: [],
       },
       uploadstatus: false,
@@ -415,7 +418,7 @@ export default {
         this.suppdis = true;
         this.getSupp();
       }
-      if (this.infoApply.taskName == "宣传负责人上传") {
+      if (this.infoApply.taskName == "投票团比稿审稿" || this.infoApply.taskName == "广告公司设计" || this.infoApply.taskName == "需求人上传需求科室及部门审核意见" || this.infoApply.taskName == "宣传负责人定稿" || this.infoApply.taskName == "需求人上传执行反馈") {
         this.uploadsts = true;
       }
       // this.getDepot();
@@ -541,7 +544,7 @@ export default {
           // this.suppdis = true;
           // this.getSupp();
         }
-        if (this.infoApply.taskName == "宣传负责人上传") {
+        if (this.infoApply.taskName == "投票团比稿审稿" || this.infoApply.taskName == "广告公司设计" || this.infoApply.taskName == "需求人上传需求科室及部门审核意见" || this.infoApply.taskName == "宣传负责人定稿" || this.infoApply.taskName == "需求人上传执行反馈") {
           let list = {
             id: this.infoApply.id,
             mkFileShareAttachList: [],