冲突

.env.development

@@ -3,4 +3,4 @@ VUE_APP_GRID_API = http://192.168.1.19:9114
 NODE_ENV = development
 
 VUE_APP_ENV = development
-outputDir = dist-dev
+outputDir = dist-dev

.env.production

@@ -4,4 +4,4 @@ VUE_APP_GRID_API =
 NODE_ENV = production
 
 VUE_APP_ENV = production
-outputDir = dist-production
+outputDir = dist-production

.env.test

@@ -2,4 +2,4 @@ VUE_APP_FILE_API =
 VUE_APP_GRID_API =
 NODE_ENV = 'production'
 VUE_APP_ENV = test
-outputDir = dist-test
+outputDir = dist-test

.gitignore

@@ -2,11 +2,16 @@
 node_modules
 /dist
 <<<<<<< HEAD
+<<<<<<< HEAD
 /dist-test
 =======
 dist.zip
 >>>>>>> b1d2e0323329f3f9e21c34540cf9e3eb31cf89a8
 
+=======
+/dist-test
+dist.zip
+>>>>>>> 2e174cfb914257ff0e2bab0e76423d7d1fe78aba
 # local env files
 .env.local
 .env.*.local

public/index.html

@@ -30,10 +30,10 @@
   </noscript>
   <div id="app"></div>
   <!-- built files will be auto injected -->
-  <!-- <script type="text/javascript">
-    // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
-    window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
-    // window.staticHost = 'http://192.168.0.103:9600/';
+  <script type="text/javascript">
+    window.staticHost = 'http://10.230.26.15:8000/mkt/'; // 正式
+    // window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
+    // window.staticHost = 'http://192.168.2.92:9600';
     // window.staticHost = 'http://43.138.50.94:9600/';
     // window.staticHost = 'http://192.168.2.43:9600/';
 

public/static/views/performance.html

@@ -33,10 +33,10 @@
     <script src="/static/js/exceljs.js"></script>
     <script src="/static/js/fileSave.js"></script>
     <script src="/static/js/luckysheet/luckSheetExcel.js"></script>
-    <!-- <script src="/marketfront/static/js/luckysheet_old/plugins/js/plugin.js?v=1.0.0"></script>
-    <script src="/marketfront/static/js/luckysheet_old/luckysheet.umd.js?v=1.0.0"></script> -->
-    <script src="/static/js/luckysheet_old/plugins/js/plugin.js?v=1.0.0"></script>
-    <script src="/static/js/luckysheet_old/luckysheet.umd.js?v=1.0.0"></script>
+    <script src="/marketfront/static/js/luckysheet_old/plugins/js/plugin.js?v=1.0.0"></script>
+    <script src="/marketfront/static/js/luckysheet_old/luckysheet.umd.js?v=1.0.0"></script>
+    <!-- <script src="/static/js/luckysheet_old/plugins/js/plugin.js?v=1.0.0"></script>
+    <script src="/static/js/luckysheet_old/luckysheet.umd.js?v=1.0.0"></script> -->
     <script src="/static/js/api.config.js"></script>
     <script src="/static/js/util.js?v=1.0.0"></script>
     <script src="/static/js/url.js?v=1.0.0"></script>
@@ -158,13 +158,13 @@
                 toolBar = '';
                 toolBar1 = '';
                 if (type == 6) {
-                    var url = 'market/IssuedCollect/getExcelInfo';
+                    var url = '/market/IssuedCollect/getExcelInfo';
                 }
                 if (type == 4 || type == 5) {
-                    var url = 'market/Issued/getExcelInfo';
+                    var url = '/market/Issued/getExcelInfo';
                 }
                 if (type == 1 || type == 2 || type == 3) {
-                    var url = 'market/FileTemplate/query';
+                    var url = '/market/FileTemplate/query';
                 }
                 util.ajaxJson("数据加载中", ctx + url,
                     {

src/assets/js/common.js

@@ -4,7 +4,9 @@ import axios from "axios";
 var qs = require('qs')
 import bus from '../../components/common/bus'
 import apiConfig from '@/config/index.js'
+import getConfig from '../../config/dev.js'
 // import {Decimal} from './decimal.js';
+let config = getConfig()
 var Decimal = require('decimal')
 let moment = require('moment')
 let common = {
@@ -263,38 +265,64 @@ let common = {
                     if (!obj.disableLoading) {
                         loading.close()
                     }
-                    if (response.data.code === 1 ||response.data.code == '1') {
-                        bus.$message.success(response.data.data.message)
-                         loading.close()
-                         success(response.data.data)
-                         return response
-                        // if (response.code === 1 ||response.code == '1') {
-                        //     bus.$message.success(response.data.message)
-                        //      loading.close()
-                        //      success(response.data)
-                        //      return response
-                    } else {
-                        if (obj.printMsg) {
-                            if (response.message) {
-                                if (eval(apiConfig.ENV_CONFIG) == 'dev' || eval(apiConfig.ENV_CONFIG) == 'test') {
-                                    bus.$message({
-                                        message: response.message,
-                                        type: 'error'
-                                    })
+                    if (process.env.VUE_APP_ENV == 'development' || process.env.VUE_APP_ENV == 'devs') {
+                        if (response.code === 1 || response.code == '1') {
+                            bus.$message.success(response.data.message)
+                            loading.close()
+                            success(response.data)
+                            return response
+                        } else {
+                            if (obj.printMsg) {
+                                if (response.message) {
+                                    if (eval(apiConfig.ENV_CONFIG) == 'dev' || eval(apiConfig.ENV_CONFIG) == 'test') {
+                                        bus.$message({
+                                            message: response.message,
+                                            type: 'error'
+                                        })
+                                    } else {
+                                        bus.$notify.error(response.message.substring(0, 100))
+                                    }
+                                    if (typeof error === 'function') {
+                                        error.call(example, response.message)
+                                    }
                                 } else {
-                                    bus.$notify.error(response.message.substring(0, 100))
-                                }
-                                if (typeof error === 'function') {
-                                    error.call(example, response.message)
+                                    bus.$notify.error('接口请求失败')
+                                    if (typeof error === 'function') {
+                                        error.call(example, '错误信息')
+                                    }
                                 }
-                            } else {
-                                bus.$notify.error('接口请求失败')
-                                if (typeof error === 'function') {
-                                    error.call(example, '错误信息')
+                            }
+                        }
+                    } else {
+                        if (response.data.code === 1 || response.data.code == '1') {
+                            bus.$message.success(response.data.message)
+                            loading.close()
+                            success(response.data.data)
+                            return response
+                        } else {
+                            if (obj.printMsg) {
+                                if (response.message) {
+                                    if (eval(apiConfig.ENV_CONFIG) == 'dev' || eval(apiConfig.ENV_CONFIG) == 'test') {
+                                        bus.$message({
+                                            message: response.message,
+                                            type: 'error'
+                                        })
+                                    } else {
+                                        bus.$notify.error(response.message.substring(0, 100))
+                                    }
+                                    if (typeof error === 'function') {
+                                        error.call(example, response.message)
+                                    }
+                                } else {
+                                    bus.$notify.error('接口请求失败')
+                                    if (typeof error === 'function') {
+                                        error.call(example, '错误信息')
+                                    }
                                 }
                             }
                         }
                     }
+
                 })
                 .catch(function (msgE) {
                     if (obj.printMsg) {

src/components/el-form.vue

@@ -120,10 +120,12 @@ export default {
   methods: {
     columnbackgroundStyle({ row, column, rowIndex, columnIndex }) {
       if (column.type == "default") {
-        if (column.property === "need_name"||column.property === "needName") {
+        if (column.type == "default") {
+        if (column.property === "need_name"||column.property === "needName"||column.property === "doc_title"||column.property === "document_title") {
           return "color:#0682CD;";
         }
       }
+      }
     },
     selectionChange(val) {
 

src/components/workflowBase.vue

@@ -460,7 +460,7 @@ export default {
     getTreeLists(e, status) {
       let createdId = "createId";
       let id =
-        e.nextShapes[0].properties.documentation === createdId
+        e.nextShapes[0].properties.documentation.indexOf(createdId) != -1
           ? this.list.createId
           : e.nextShapes[0].properties.documentation;
       console.log(id);

src/components/workflowEntrance.vue

@@ -505,10 +505,10 @@ export default {
     //选择树的回调
     changeTree(e) {
       if (this.MultipersonTransfer) {
-        if (e.length > 1) {
-          this.$message.error("只能选择一个人");
-          return;
-        } else {
+        // if (e.length > 1) {
+        //   this.$message.error("只能选择一个人");
+        //   return;
+        // } else {
           this.backThree = e;
           let arr = [];
           this.backThree.map((item) => {
@@ -516,7 +516,7 @@ export default {
           });
           this.nextDealManLists = arr.toString();
         }
-      }
+      // }
     },
     //获取字典表常用意见
     getMetirialType(e) {

src/config/dev.js

@@ -3,25 +3,37 @@ let devs = {
     TITLE:'本地环境',
     BASE_URL:"http://43.138.50.94:9600/", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777" //本地excel路径
+    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
+    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
+    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
+    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
 }
 let dev = {
     TITLE:'本地环境',
     BASE_URL:"http://127.0.0.1:8080", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
-    EXCEL_URL:"http://43.138.50.94:7777" //本地excel路径
+    EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
+    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
+    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
+    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
 }
 let test = {
     TITLE:'测试环境',
     BASE_URL:"http://10.149.85.91:8000/spfm", //测试环境
     BASE_API:"http://10.149.85.91:8000/api",//工作流测试环境
-    EXCEL_URL:"http://10.149.85.91:7777" //测试excel路径
+    EXCEL_URL:"http://10.149.85.91:7777", //测试excel路径
+    provincialWorkOrderAreafresourceId:'33b0af93-b1ce-11ed-be6b-00505687dcd3',//通用工单地市
+    provincialWorkOrderfresourceId:'4fdbb96e-8bfd-11ed-8988-00505687dcd3',//通用工单省
+    riskMaterialsfresourceId:'3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
 }
 let prod = {
     TITLE:'线上环境',
     BASE_URL:"http://10.230.26.15:8000/mkt", //线上环境
     BASE_API:"http://10.230.26.15:8000/api",//工作流线上环境
-    EXCEL_URL:"http://10.230.26.15:7777" //线上excel路径
+    EXCEL_URL:"http://10.230.26.15:7777", //线上excel路径
+    provincialWorkOrderAreafresourceId:'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
+    provincialWorkOrderfresourceId:'9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
+    riskMaterialsfresourceId:'canvas',//风险防控
 }
 export const getConfig  = () =>{
     switch(process.env.VUE_APP_ENV){

src/pages/main/advertising/contractCap.vue

@@ -27,7 +27,11 @@
                     </el-table-column>
                     <el-table-column prop="secbuySchedule" label="使用进度">
                     </el-table-column>
-                    <el-table-column :label="item.supplierName" v-for="(item, index) in supplierArr" :key="index">
+                    <!-- <el-table-column
+                        :label="item.supplierName"
+                        v-for="(item, index) in supplierArr"
+                        :key="index"
+                    >
                         <template slot-scope="scope">
                             <div v-if="
                                 scope.row.cMkSupplierCumulativeAmounts.filter(
@@ -42,7 +46,7 @@
                                 {{ item.sumBudget }}
                             </div>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <!-- <el-table-column prop="advYearn" :label="advYearnLabel">
             					</el-table-column> -->
                     <el-table-column label="操作" width="160px" align="center" v-if="advLeader">

src/pages/main/documentCollection/documentCollectionApprovalExcel.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container" id="container" v-loading="loading">
         <fullscreen :fullscreen.sync="fullscreen" class="container" style="margin: 0;width: 100%;">
-            <iframe height="100%" width="100%" src="/static/views/performance.html" frameborder="0" ref="iframe"
+            <iframe height="100%" width="100%" src="/marketfront/static/views/performance.html" frameborder="0" ref="iframe"
                 name="excelIframe" id="excelIframe"></iframe>
         </fullscreen>
         <el-dialog :title="'督办'" :visible.sync="dubanStatus" width="50%" :destroy-on-close="true"
@@ -105,7 +105,7 @@
                     </div>
                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
                         <!-- <el-button @click="closeauthSettingStatus()">取 消</el-button> -->
-                        <el-button type="primary" @click="processAuth()">关 闭</el-button>
+                        <el-button type="primary" @click="processAuth()">确 定</el-button>
                     </div>
                 </div>
             </el-form>
@@ -209,21 +209,21 @@ export default {
                     {
                         required: true,
                         trigger: "change",
-                        message: "请选择类型",
+                        message: "请选择派发周期",
                     },
                 ],
                 distributeTime: [
                     {
                         required: true,
                         trigger: "blur",
-                        message: "请选择类型",
+                        message: "请选择填报日期",
                     },
                 ],
                 distributeEndTime: [
                     {
                         required: true,
                         trigger: "blur",
-                        message: "请选择类型",
+                        message: "请选择截至日期",
                     },
                 ],
             },
@@ -1166,7 +1166,7 @@ export default {
     }
 }
 </style>
-<style scoped>
+<style scoped lang="scss">
 .containerr {
     background: #fff;
     height: calc(100vh);
@@ -1180,4 +1180,7 @@ export default {
 span {
     width: 80px;
 }
+::v-deep .el-button--text {
+    display: none !important;
+}
 </style>

src/pages/main/documentCollection/documentCollectionApprovalIssuedMoud.vue

@@ -25,7 +25,7 @@
                     </el-table-column>
                     <el-table-column prop="updateTime" label="配置时间" align="center">
                     </el-table-column>
-                    <el-table-column prop="createId" label="配置人员" align="center">
+                    <el-table-column prop="createName" label="配置人员" align="center">
                     </el-table-column>
 
                     <el-table-column prop="status" label="模板状态" align="center">
@@ -86,8 +86,8 @@
                             message: '截止时间不能为空',
                             trigger: 'change',
                         }">
-                            <el-date-picker v-model="issue_form.endTime" type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%;">
+                            <el-date-picker v-model="issue_form.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                                style="width: 100%;">
                             </el-date-picker>
                         </el-form-item>
                     </el-form>
@@ -141,8 +141,7 @@
                                 :type="depttype" :closeList="closeList"></deptTreeOnly>
                             <div class="tree treeUser">
                                 <p>{{ treeListonly.leaderAuditName }}
-                                    <i v-if="treeListonly.leaderAuditName" @click="treeDelete()"
-                                        class="el-icon-error"></i>
+                                    <i v-if="treeListonly.leaderAuditName" @click="treeDelete()" class="el-icon-error"></i>
                                 </p>
                             </div>
                             <el-form-item style="margin-bottom:0;display:none;">
@@ -175,8 +174,8 @@
                         <el-table-column prop="status" label="审批意见">
                         </el-table-column>
                     </el-table>
-                    <el-pagination class="pageBox" @current-change="issuedLogChange" layout="prev, pager, next"
-                        background :total="issuedLogTotal">
+                    <el-pagination class="pageBox" @current-change="issuedLogChange" layout="prev, pager, next" background
+                        :total="issuedLogTotal">
                     </el-pagination>
                 </div>
             </el-dialog>
@@ -294,10 +293,10 @@ export default {
         xiafaqueding() {
             console.log(this.issue_form);
             console.log(this.$refs.issue_ref);
-            
+
             this.$refs.issue_ref.validate((valid) => {
                 if (valid) {
-                    this.BtnDisabled=true
+                    this.BtnDisabled = true
                     if (this.issue_form.endTime) {
                         this.$http({
                             url: "/market/Issued/issuedTemplate",
@@ -320,7 +319,7 @@ export default {
                                 this.getList({}, this.pageSize);
                             }
                             this.issue_visible = false;
-                            this.BtnDisabled=false;
+                            this.BtnDisabled = false;
                         });
                     } else {
                         this.$http({
@@ -344,7 +343,7 @@ export default {
                                 this.getList({}, this.pageSize);
                             }
                             this.issue_visible = false;
-                            this.BtnDisabled=false;
+                            this.BtnDisabled = false;
                         });
                     }
 
@@ -420,6 +419,9 @@ export default {
                 },
             }).then(({ data: { totalRecord, data } }) => {
                 this.tableData = data;
+                this.tableData.map((item) => {
+                    item.createName = JSON.parse(window.sessionStorage.getItem('userInfo')).loginName
+                })
                 this.total = totalRecord;
                 this.loading = false;
             });

src/pages/main/homeMarket/tvAssess/initiateAssess.vue

@@ -20,6 +20,7 @@
                     <div class="tabbox" v-show="tableType" style="padding: 0 20px;">
                         <el-table
                             class="com-table"
+                            :key="Date.now()"
                             ref="multipleTable"
                             :data="infolist.tableData"
                             tooltip-effect="dark"
@@ -105,6 +106,7 @@
                     <div class="tabbox" v-show="!tableType" style="padding: 0 20px;">
                         <el-table
                             class="com-table"
+                            :key="Date.now()"
                             ref="multipleTable"
                             :data="vtableData"
                             tooltip-effect="dark"

src/pages/main/homeMarket/tvAssess/tvAssessIndex.vue

@@ -268,6 +268,7 @@
                         </div>
                         <el-table
                             class="com-table"
+                            :key="Date.now()"
                             ref="multipleTable"
                             :data="khDetVipTable"
                             tooltip-effect="dark"

src/pages/main/leader/leaderhomeTask.vue

@@ -105,7 +105,7 @@
           <!-- <el-pagination class="pageBox"  @current-change="currchangeDone"
             layout="total,prev, pager, next" background :total="totalDone" page-size="10">
           </el-pagination> -->
-          <el-pagination @current-change="currchangeDyiban" :current-page="yibanpage" :page-size="yibansize"
+          <el-pagination @current-change="currchangeyiban" :current-page="yibanpage" :page-size="yibansize"
             layout="total,prev, pager, next" :total="yibantotal" v-if="tabbox2">
           </el-pagination>
         </div>

src/pages/main/leader/risk/riskManagement.vue

@@ -208,6 +208,7 @@ import {
     getDoneBase,
     getInitiateBase,
 } from "../../../../http/api.js";//../../../http/api.js
+import getConfig from '../../../../config/dev.js'
 import { log } from "console";
 export default {
     components: {
@@ -245,8 +246,9 @@ export default {
             },
             requestForm: {
                 // fresourceId: "0d94de8a-0281-11ed-a302-4ae7da54db39", // 本地环境
-                fresourceId: "canvas", // 生产环境
+                // fresourceId: "canvas", // 生产环境
                 // fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
+                fresourceId: getConfig().riskMaterialsfresourceId, 
                 processDefinitionKey: "fxfk_process",
             },
             rule: {
@@ -906,7 +908,7 @@ export default {
             // });
         },
         setForm(e) {
-            this.request_form.title = this.fromList.needName;
+            this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
             this.fromList.transactorList = []
             this.treeListonly.map((item) => {
                 this.fromList.transactorList.push(item.key)

src/pages/main/leader/risk/riskMaterials.vue

@@ -119,6 +119,7 @@ import {
     getDoneBase,
     getInitiateBase,
 } from "../../../../http/api.js";//../../../http/api.js
+import getConfig from '../../../../config/dev.js'
 export default {
     components: {
         Table,
@@ -181,8 +182,9 @@ export default {
             },
             requestForm: {
                 // fresourceId: "c9104902-6575-11ed-8e1e-d6cd97160e00", // 本地环境
-                fresourceId: "canvas", // 生产环境
+                // fresourceId: "canvas", // 生产环境
                 // fresourceId: "3124a2d4-7209-11ed-8d6f-00505687dcd3", //测试91环境
+                fresourceId: getConfig().riskMaterialsfresourceId, 
                 processDefinitionKey: "fxfk_process",
             },
             dialogStatus: false, //dialog显示
@@ -999,7 +1001,7 @@ export default {
         },
         setForm(e) {
             // console.log(this.$refs.form)
-            this.request_form.title = this.fromList.needName;
+            this.request_form.title = '[市场工作台]-风险点防控-'+this.fromList.needName;
             // this.request_form.title = this.$refs.form.needName;
             // this.$refs.form.taskId = e;
             this.$http({

src/pages/main/productionDataExport/cityHome.vue

@@ -57,7 +57,7 @@
             />
             <div>
                 <div class="table-title">流程追踪</div>
-                <Table :list="lables"></Table>
+                <Tableid :list="lables"></Tableid>
             </div>
         </el-dialog>
         <div v-if="destroy">
@@ -90,6 +90,7 @@
     import Seach from "../../../components/el-search.vue";
     import Tabs from "../../../components/el-tabs.vue";
     import Table from "../../../components/el-form";
+    import Tableid from "../../../components/el-formid";
     import WorkflowEntrance from "../../../components/workflowEntrance";
     import {
         getTodoBase,
@@ -101,6 +102,7 @@
         components: {
             Tabs,
             Table,
+            Tableid,
             Seach,
             FormTable,
             Workflow,
@@ -108,7 +110,7 @@
         },
         data() {
             return {
-                tableName: "scsjdc_city_process",
+                tableName: "scsjdc_cit_process",
                 buttonStatus: true,
                 copyStatus: false,
                 dialogTitle: "",
@@ -141,13 +143,13 @@
                     // nextDealMan:'',
                     title: "title",
                     businessKey: "",
-                    processDefinitionKey: "scsjdc_city_process",
+                    processDefinitionKey: "scsjdc_cit_process",
                 },
                 requestForm: {
                     // fresourceId: "7eb377e2-3304-11ed-a6ed-02427ba2d388", // 本地环境
-                    fresourceId: "canvas", // 生产环境
+                    fresourceId: "dd20df6f-c312-11ed-afb6-e00084564cce", // 生产环境
                     // fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
-                    processDefinitionKey: "scsjdc_city_process",
+                    processDefinitionKey: "scsjdc_cit_process",
                 },
                 treeList: [], //候选人列表
                 treeCopyList: [], //抄送人列表
@@ -444,12 +446,24 @@
             };
         },
         created() {
-            //oa跳转回来显示
-            this.getQueryList();
-            this.getMeDone();
-            this.getMeLaunch();
 
-            this.lable = this.todoBase;
+            let status = JSON.stringify(this.$route.query) == "{}";
+            if (status) {
+                //oa跳转回来显示
+                this.getQueryList();
+                this.getMeDone();
+                this.getMeLaunch();
+                this.lable = this.todoBase;
+
+            } else {
+                let { id, type } = this.$route.query;
+                let list = {
+                    taskId: id,
+                    tableName: this.tableName
+                };
+                this.getQueryList(0, list,0);//代办
+            }
+
         },
         methods: {
             //添加面包屑
@@ -873,8 +887,18 @@
                         if (this.fromList.id) {
                             this.setUpdateForm(this.$refs.formTable.form);
                         } else {
-                            this.getUserIds();
-                            this.setForm();
+                            this.$http({
+                                url: "/market/api/user/info/queryNodePers?params=" + JSON.parse(window.sessionStorage.userInfo).loginNo,
+                                method: "post",
+                                headers: {
+                                    "Content-Type": "application/json",
+                                },
+                            }).then((res) => {
+                                console.log(res);
+                                this.request_form.userName = res.data[0].children[0].loginNameStr;
+                                this.request_form.userId = res.data[0].children[0].loginNoStr;
+                                this.setForm()
+                            });
                         }
                     } else {
                         this.$message.error("请完善表单信息");
@@ -887,23 +911,21 @@
             //获取自己idname
             getUserIds() {
                 this.$http({
-                    url: "/market/waf/queryRoleByName",
+                    url: "/market/api/user/info/queryNodePers?params=" + JSON.parse(window.sessionStorage.userInfo).loginNo,
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
                     },
-                    data: {
-                        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
-                    },
                 }).then((res) => {
-                    this.request_form.userName = res.data.data.rows[0].name;
-                    this.request_form.userId = res.data.data.rows[0].userCode;
+                    console.log(res);
+                    this.request_form.userName = res.data[0].children[0].loginNameStr;
+                    this.request_form.userId = res.data[0].children[0].loginNoStr;
                 });
             },
 
 
             setForm(e) {
-                this.request_form.title = this.$refs.formTable.form.needName;
+                this.request_form.title = "[工作台]-地市生产数据导出-" + this.$refs.formTable.form.needName;
                 this.$http({
                     url: "/market/scsjdcCitProcess/add",
                     method: "post",
@@ -1098,11 +1120,11 @@
             },
             //点击查阅接口
             //获取我的代办列表List
-            getQueryList(e, status) {
-                let list = {
-                    tableName: this.tableName,
-                };
-                getTodoBase(this.totalPage, "", list).then((res) => {
+            getQueryList(e, currentList, status) {
+                getTodoBase(this.totalPage, "", currentList || {tableName: this.tableName}).then((res) => {
+                    if (status === 0) {
+                        this.clickDemand("文件标题", res.data.data[0]);
+                    }
                     this.tabList[0].number = res.data.totalRecord;
                     if (e !== "1") {
                         this.todoBase.data = res.data.data;

src/pages/main/productionDataExport/formTable.vue

@@ -216,7 +216,7 @@
         data() {
             var validateRequirementContent = (rule, value, callback) => {
                 if (!this.disabled) {
-                    if (this.form.exportType === '2' && (!value || value.length <= 50)) {
+                    if (this.form.exportType === '2' && (!value || value.length < 50)) {
                         callback(new Error('如为明细级数据导出，请详细描述具体原由，至少50字。'));
                     } else if (!value) {
                         callback(new Error('请输入需求内容'));

src/pages/main/productionDataExport/provinceHome.vue

@@ -57,7 +57,7 @@
             />
             <div>
                 <div class="table-title">流程追踪</div>
-                <Table :list="lables"></Table>
+                <Tableid :list="lables"></Tableid>
             </div>
         </el-dialog>
         <div v-if="destroy">
@@ -91,6 +91,7 @@
     import Seach from "../../../components/el-search.vue";
     import Tabs from "../../../components/el-tabs.vue";
     import Table from "../../../components/el-form";
+    import Tableid from "../../../components/el-formid";
     import WorkflowEntrance from "../../../components/workflowEntrance";
 
     import {
@@ -103,6 +104,7 @@
         components: {
             Tabs,
             Table,
+            Tableid,
             Seach,
             FormTable,
             Workflow,
@@ -146,8 +148,8 @@
                     processDefinitionKey: "scsjdc_pro_process",
                 },
                 requestForm: {
-                    // fresourceId: "d3f1793f-2f20-11ed-a6ed-02427ba2d388", // 本地环境
-                    fresourceId: "canvas", // 生产环境
+                    // fresourceId: "ae3564a5-96f2-11ed-be6b-00505687dcd3", // 本地环境
+                    fresourceId: "b67ff4ed-c312-11ed-afb6-e00084564cce", // 生产环境
                     // fresourceId: "bf79721c-33f3-11ed-ba0b-00505687dcd3", //测试环境
                     processDefinitionKey: "scsjdc_pro_process",
                 },
@@ -446,12 +448,24 @@
             };
         },
         created() {
-            //oa跳转回来显示
-            this.getQueryList();
-            this.getMeDone();
-            this.getMeLaunch();
 
-            this.lable = this.todoBase;
+            let status = JSON.stringify(this.$route.query) == "{}";
+            if (status) {
+                //oa跳转回来显示
+                this.getQueryList();
+                this.getMeDone();
+                this.getMeLaunch();
+                this.lable = this.todoBase;
+
+            } else {
+                let { id, type } = this.$route.query;
+                let list = {
+                    taskId: id,
+                    tableName: this.tableName
+                };
+                this.getQueryList(0, list,0);//代办
+            }
+
         },
         methods: {
             //添加面包屑
@@ -876,8 +890,19 @@
                         if (this.fromList.id) {
                             this.setUpdateForm(this.$refs.formTable.form);
                         } else {
-                            this.getUserIds();
-                            this.setForm();
+
+                            this.$http({
+                                url: "/market/api/user/info/queryNodePers?params=" + JSON.parse(window.sessionStorage.userInfo).loginNo,
+                                method: "post",
+                                headers: {
+                                    "Content-Type": "application/json",
+                                },
+                            }).then((res) => {
+                                console.log(res);
+                                this.request_form.userName = res.data[0].children[0].loginNameStr;
+                                this.request_form.userId = res.data[0].children[0].loginNoStr;
+                                this.setForm();
+                            });
                         }
                     } else {
                         this.$message.error("请完善表单信息");
@@ -890,17 +915,15 @@
             //获取自己idname
             getUserIds() {
                 this.$http({
-                    url: "/market/waf/queryRoleByName",
+                    url: "/market/api/user/info/queryNodePers?params=" + JSON.parse(window.sessionStorage.userInfo).loginNo,
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
                     },
-                    data: {
-                        userCode: JSON.parse(window.sessionStorage.userInfo).loginNo,
-                    },
                 }).then((res) => {
-                    this.request_form.userName = res.data.data.rows[0].name;
-                    this.request_form.userId = res.data.data.rows[0].userCode;
+                    console.log(res);
+                    this.request_form.userName = res.data[0].children[0].loginNameStr;
+                    this.request_form.userId = res.data[0].children[0].loginNoStr;
                 });
             },
 
@@ -1061,7 +1084,7 @@
             },
 
             setUpdateForm(e) {
-                this.request_form.title = this.$refs.formTable.form.needName;
+                this.request_form.title = "[工作台]-省生产数据导出-" + this.$refs.formTable.form.needName;
                 // this.$refs.formTable.form.taskId = e;
                 this.$http({
                     url: "/market/scsjdcProProcess/update",
@@ -1103,11 +1126,11 @@
             },
             //点击查阅接口
             //获取我的代办列表List
-            getQueryList(e, status) {
-                let list = {
-                    tableName: this.tableName,
-                };
-                getTodoBase(this.totalPage, "", list).then((res) => {
+            getQueryList(e, currentList, status) {
+                getTodoBase(this.totalPage, "", currentList || {tableName: this.tableName}).then((res) => {
+                    if (status === 0) {
+                        this.clickDemand("文件标题", res.data.data[0]);
+                    }
                     this.tabList[0].number = res.data.totalRecord;
                     if (e !== "1") {
                         this.todoBase.data = res.data.data;

src/pages/main/provincialWorkOrder/provincialWorkOrder.vue

@@ -116,6 +116,7 @@ import {
     queryReadBase,
     queryReadDoneBase
 } from "../../../http/api.js";//../../../http/api.js
+import getConfig from '../../../config/dev.js'
 import { log } from "console";
 export default {
     components: {
@@ -214,8 +215,9 @@ export default {
             },
             requestForm: {
                 // fresourceId: "08368848-2fde-11ed-a6ed-02427ba2d388", // 本地环境
-                // fresourceId: "canvas", // 生产环境
-                fresourceId: "4fdbb96e-8bfd-11ed-8988-00505687dcd3", //测试91环境
+                // fresourceId: "9b83efc7-b984-11ed-afb6-e00084564cce", // 生产环境
+                // fresourceId: "4fdbb96e-8bfd-11ed-8988-00505687dcd3", //测试91环境
+                fresourceId: getConfig().provincialWorkOrderfresourceId, 
                 processDefinitionKey: "tygd_pro_process",
             },
             dialogStatus: false, //dialog显示
@@ -1045,7 +1047,7 @@ export default {
         },
         setForm(e) {
             // console.log(this.$refs.form)
-            this.request_form.title = this.fromList.needName;
+            this.request_form.title = '[工作台]-省通用工单-'+this.fromList.needName;
             // this.request_form.title = this.$refs.form.needName;
             // this.$refs.form.taskId = e;
             console.log(this.fromList.mkFileShareAttachList);

src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue

@@ -122,6 +122,7 @@ import {
     getNowdata,
 } from "../../../http/api.js";//../../../http/api.js
 import { log } from "console";
+import getConfig from '../../../config/dev.js'
 export default {
     components: {
         Table,
@@ -219,8 +220,10 @@ export default {
             },
             requestForm: {
                 // fresourceId: "a682dc9f-2fea-11ed-a6ed-02427ba2d388", // 本地环境
-                // fresourceId: "canvas", // 生产环境
-                fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
+                // fresourceId: "db26384e-b984-11ed-afb6-e00084564cce", // 生产环境
+                // fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
+
+                fresourceId: getConfig().provincialWorkOrderAreafresourceId, 
                 processDefinitionKey: "tygd_cit_process",
             },
             dialogStatus: false, //dialog显示
@@ -861,7 +864,7 @@ export default {
         },
         setForm(e) {
             // console.log(this.$refs.form)
-            this.request_form.title = this.fromList.needName;
+            this.request_form.title = '[工作台]-地市通用工单-'+this.fromList.needName;
             // this.request_form.title = this.$refs.form.needName;
             // this.$refs.form.taskId = e;
             console.log(this.fromList.mkFileShareAttachList);

src/pages/main/terminals/components/adverts.vue

@@ -378,12 +378,13 @@ export default {
 
       let res = await this.common.httpPost(obj, success);
       function success(data) {
-        data.data.map((item) => {
+        // console.log('测试返回data',data);
+        data.data.data.map((item) => {
           item.startTime = _this.$util.datetimeFormat(item.startTime);
           item.endTime = _this.$util.datetimeFormat(item.endTime);
         });
         console.log(data.data);
-        _this.rovaList = data.data;
+        _this.rovaList = data.data.data;
         // _this.lables.data = data.data;
         // data.data.map((item) => {
         //   item.startTime = _this.$util.datetimeFormat(item.startTime);

src/router/index.js

@@ -2208,9 +2208,23 @@ const routes = [{
             name: 'processruns',
 
             component: resolve => require(['../pages/main/processruns/processruns.vue'], resolve),
-            meta: { title: '运行流程' }
-        }
-        ,{
+            meta: {title: '运行流程'}
+        },
+        {
+            meta: {name: '', keepAlive: false},
+            path: '/productionDataExportCityHome',
+            name: 'productionDataExportCityHome',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/productionDataExport/cityHome.vue'], resolve)
+        },
+        {
+            meta: {name: '', keepAlive: false},
+            path: '/productionDataExportProvinceHome',
+            name: 'productionDataExportProvinceHome',
+            component: (resolve) => require( /* webpackChunkName: "system" */
+                ['../pages/main/productionDataExport/provinceHome.vue'], resolve)
+        },
+        , {
             meta: { name: '风险防控管理', keepAlive: false },
             path: '/riskMaterials',
             name: 'riskMaterials',
@@ -2255,7 +2269,7 @@ const routes = [{
                     name: 'documentCollectionApprovalIssuedCollect',
                     component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/documentCollection/documentCollectionApprovalIssuedCollect'], resolve)
                 },
-               
+
             ]
         },
         {