文件收集与审批

config/dev.env.js

@@ -6,10 +6,10 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   ctx:'"http://127.0.0.1:8080"',
-  // ctxForm: '"http://10.149.85.91:8000"',//dev
-  // ctxForm: '"http://43.138.50.94:8880"',//test
-  // ctxForm: '"http://192.168.2.124:8880"',//test
-  ctxForm: '"http://10.230.26.15:8000"',//生产
+  ctxForm: '"http://10.149.85.91:8000/api"',//dev
+  // ctxForm: '"http://43.138.50.94:8880/api"',//test
+  // ctxForm: '"http://192.168.2.92:8880/api"',//test
+  // ctxForm: '"http://10.230.26.15:8000"',//生产
 
   excludeMeWhenSelectNextHandler:false,
   excludeFormerHanlder:false,

package.json

@@ -15,6 +15,7 @@
     "@tinymce/tinymce-vue": "^3.0.1",
     "axios": "^0.19.0",
     "canvg": "^3.0.7",
+    "console": "^0.7.2",
     "core-js": "^3.6.1",
     "echarts": "^4.7.0",
     "element-ui": "^2.15.7",

public/index.html

@@ -33,8 +33,8 @@
   <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/';
     // window.staticHost = 'http://43.138.50.94:9600/';
+    // window.staticHost = 'http://192.168.2.43:9600/';
 
     // document.title = "hello";
   </script>

public/static/views/performance.html

@@ -231,7 +231,8 @@
                                 }
                             }
 
-                            //toolBar += '<button id="saves" class="btn btn-primary btn-danger" style=" padding:4px 12px;border-radius:8px; font-size: 12px; margin-right: 10px;">保存</button>';
+                            toolBar += '<button id="getOutUrl" class="btn btn-primary btn-primary" style="padding:4px 12px;border-radius:8px;font-size: 16px;margin-right: 10px;">返回</button>';
+                            // toolBar += '<button id="getOutUrl" class="btn btn-primary btn-danger" style=" padding:4px 12px;border-radius:8px; font-size: 12px; margin-right: 10px;">返回</button>';
                             var eJson = res.body.excelJson;
                             var cellData = luckysheet.transToCellData(eJson[0].data);
                             eJson[0].celldata = cellData;
@@ -305,8 +306,8 @@
                             findAndReplace: showToolBar, // '查找替换'
                             protection: showToolBar, // '工作表保护'
                             print: showToolBar, // '打印'
-                            border: false, // '边框'
-                            function: false, // '公式'
+                            border: true, // '边框'
+                            function: true, // '公式'
                         },
                         showinfobar: true, // 顶部信息 文件名称 按钮
                         allowUpdate: false, // 是否允许操作表格后的后台更新 在线文档websocket时为true
@@ -424,6 +425,11 @@
                     //调用vue页面方法执行新增/修改
                     window.parent['addNewTemplate'](excelName, excelData, templateType);
                 });
+                //退出
+                $('#getOutUrl').off("click").click(function () {
+                    //调用vue页面方法执行新增/修改
+                    window.parent['getOutUrl']('true');
+                });
                 //转派
                 $('#toZhuanpai').off("click").click(function () {
                     var excelId = $(window.parent.document).find("#excelId").attr("value");

src/assets/js/common.js

@@ -263,16 +263,16 @@ let common = {
                     if (!obj.disableLoading) {
                         loading.close()
                     }
-                    // if (response.data.code === 1 ||response.data.code == '1') {
-                    //     bus.$message.success(response.data.message)
-                    //      loading.close()
-                    //      success(response.data.data)
-                    //      return response
-                        if (response.code === 1 ||response.code == '1') {
-                            bus.$message.success(response.message)
-                             loading.close()
-                             success(response.data)
-                             return response
+                    if (response.data.code === 1 ||response.data.code == '1') {
+                        bus.$message.success(response.data.message)
+                         loading.close()
+                         success(response.data.data)
+                         return response
+                        // if (response.code === 1 ||response.code == '1') {
+                        //     bus.$message.success(response.message)
+                        //      loading.close()
+                        //      success(response.data)
+                        //      return response
                     } else {
                         if (obj.printMsg) {
                             if (response.message) {

src/components/workflowBase.vue

@@ -316,7 +316,7 @@ export default {
     async nextWork(list) {
       //e:yes||no,list：传入数组，title:结束标签，res:驳回标签,id:工单更新id
       let _this = this;
-      let copylist=list
+      let copylist = list
       let obj = {
         url: _this.$url.formList.nextWork, //下一步工作流接口
         data: list,
@@ -540,33 +540,18 @@ export default {
         });
         this.nextDealManList = arr.toString();
       } else {
-        if (this.manyPeopleStatus == true) {
-          this.backThree = e;
-
-          let arr = [];
-          this.backThree.map((item) => {
-            arr.push(item.loginNoStr);
-          });
-          this.nextDealManList = arr.toString();
+        if (e.length > 1) {
+          this.$message.error("只能选择一个人");
+          return;
         } else {
-          if (e.length > 1) {
-            this.$message.error("只能选择一个人");
-            return;
+          this.backThree = e;
+          if (this.CopyStatus === true) {
+            this.getTreeLists(e[0].loginNoStr, 2);
+          }
+          if (e[0]) {
+            this.selectUser = e[0].loginNameStr;
           } else {
-            this.backThree = e;
-            if (this.CopyStatus === true) {
-              this.getTreeLists(e[0].loginNoStr, 2);
-            }
-
-            if (this.CopyStatus === true) {
-              this.getTreeLists(e[0].loginNoStr, 2);
-            }
-
-            if (e[0]) {
-              this.selectUser = e[0].loginNameStr;
-            } else {
-              this.selectUser = "暂无选择";
-            }
+            this.selectUser = "暂无选择";
           }
         }
       }

src/pages/main/documentCollection/documentCollectionApprovalExcel.vue

@@ -45,21 +45,26 @@
             <el-form :model="testModel" ref="addInfoList">
                 <div>
                     <div class="info-line">
-                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="1" style="margin: 10px">无特殊权限</el-radio>
+                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="1"
+                            style="margin: 10px">无特殊权限</el-radio>
                         <div id="noLimit" class="info-line">
                             <span style="margin-right:10px;margin-left: 10px">负责人：</span>
-                            <el-button v-if="type == '1' || type == '2'" type="primary" @click="noLimitUserAdd()">组织机构</el-button>
+                            <el-button v-if="type == '1' || type == '2'" type="primary"
+                                @click="noLimitUserAdd()">组织机构</el-button>
                             <span style="margin-right: 10px;margin-left: 10px;display: inline-block;color: blue;">{{
                                 noLimitUserName }}</span>
                         </div>
                     </div>
                     <div class="info-line">
-                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2" style="margin: 10px">特殊权限</el-radio>
+                        <el-radio v-if="type == '1' || type == '2'" v-model="authType" label="2"
+                            style="margin: 10px">特殊权限</el-radio>
                         <div id="limit">
                             <div v-for="(item, index) in limitList">
                                 <div style="margin-right: 10px;margin-left: 10px;display: inline-block;">负责人：</div>
-                                <el-button v-if="type == '1' || type == '2'" type="primary" @click="limitUserAdd(index)">组织机构</el-button>
-                                <div style="margin-right: 10px;margin-left: 10px;display: inline-block;color: blue;">{{ item.userName }}
+                                <el-button v-if="type == '1' || type == '2'" type="primary"
+                                    @click="limitUserAdd(index)">组织机构</el-button>
+                                <div style="margin-right: 10px;margin-left: 10px;display: inline-block;color: blue;">{{
+                                    item.userName }}
                                 </div>
                                 <div style="margin-right: 5px;margin-left: 5px;display: inline-block;">可编辑行：从</div>
 
@@ -93,6 +98,9 @@
                             <el-button style="width: 80px;margin-right: 20px;margin-left: 40px"
                                 v-if="type == '1' || type == '2'" @click="addNewLimitAuth()">添加
                             </el-button>
+                            <el-button style="width: 80px;margin-right: 20px;margin-left: 40px" type="danger"
+                                v-if="(type == '1' || type == '2') && limitList.length > 1" @click="delNewLimitAuth()">删除
+                            </el-button>
                         </div>
                     </div>
                     <div slot="footer" style="text-align: right;padding-bottom: 20px;padding-top: 20px">
@@ -260,11 +268,12 @@ export default {
     methods: {
         // 填报日期
         handleWrite(value) {
-            if (value) {
+            if (value) {//
+                let time = value.getTime() + 86400000
                 let range =
-                    new Date().getTime() > value.getTime()
+                    new Date().getTime() > time
                         ? new Date().getTime()
-                        : value.getTime();
+                        : time;
                 this.pickOptions = {
                     disabledDate(time) {
                         return time.getTime() < range;
@@ -688,6 +697,9 @@ export default {
         showdubanDialog() {
             this.dubanStatus = true;
         },
+        getOutUrl() {
+            this.$router.go(-1);
+        },
         closeauthSettingStatus() {
             this.success = true;
             if (this.authType == '1') {
@@ -907,6 +919,9 @@ export default {
             }
 
         },
+        delNewLimitAuth() {
+            this.limitList.pop()
+        },
         processNoLimitUsers() {
             // console.log(this.treeList);
             // console.log(this.treeListonly);
@@ -1063,6 +1078,9 @@ export default {
         window['dubanBtnDialog'] = (rp) => {
             this.showdubanDialog(rp);
         }
+        window['getOutUrl'] = (rp) => {
+            this.getOutUrl(rp);
+        }
         window['addNewTemplate'] = (sheetName, excelData, templateType) => {
             this.addNewTemplate(sheetName, excelData, templateType);
         };

src/pages/main/documentCollection/newTree.vue

@@ -239,6 +239,9 @@ export default {
 ::v-deep .el-transfer-panel__body {
   height: 100%;
 }
+::v-deep .el-transfer-panel__list{
+  height: 100%;
+}
 
 .tree-text {
   font-size: 20px;

src/pages/main/provincialWorkOrder/provincialWorkOrder.vue

@@ -8,13 +8,6 @@
         <div class="flex-count">
             <Table v-loading="loading" @clickDemand="clickDemand" :list="lableTable" ref="TableList" @changeNum="changeNum"
                 @changeSize="changeSize">
-                <!-- <template v-slot:first>
-                                                                        <Export :num="num" ref="export" :exportStatusList="exportStatus" @seachExportList="seachExportList"
-                                                                            @export="batchExport" @clickApproval="clickApproval"></Export>
-                                                                    </template> -->
-                <!-- <template v-slot:first>
-                                                                        <Seach :list="filterData" @seachList="seachList"></Seach>
-                                                                    </template> -->
             </Table>
         </div>
         <el-dialog :title="dialogTitle" :visible.sync="dialogStatus" width="100%" :before-close="handleClose" :modal="false"
@@ -302,16 +295,16 @@ export default {
                     label: "我发起的",
                     number: 3,
                 },
-                {
-                    index: "four",
-                    label: "待阅",
-                    number: 4,
-                },
-                {
-                    index: "five",
-                    label: "已阅",
-                    number: 5,
-                },
+                // {
+                //     index: "four",
+                //     label: "待阅",
+                //     number: 4,
+                // },
+                // {
+                //     index: "five",
+                //     label: "已阅",
+                //     number: 5,
+                // },
             ],
             lableTable: {},//传给子组件table
             phone: '',
@@ -494,7 +487,7 @@ export default {
                     ],
                 },
             },
-            fourTable: {
+            fourlabel: {
                 name: "four",
                 titledata: [
                     {
@@ -552,14 +545,25 @@ export default {
                                 this.dialogStatus = true;
                                 this.disabled = true;
                                 this.buttonStatus = false;
-                                this.getReadList(r.copytaskid);
+                                let copymanlist = r.copyman.split(',')
+                                let copytaskidlist = r.copytaskid.split(',')
+                                let copytaskid=''
+                                console.log(copymanlist);
+                                console.log(copytaskidlist);
+                                copymanlist.map((item, index) => {
+                                    if (item == JSON.parse(window.sessionStorage.getItem('userInfo')).loginNoStr) {
+                                        copytaskid=copytaskidlist[index]
+                                    }
+                                })
+                                console.log(copytaskid);
+                                this.getReadList(copytaskid);
                                 this.clickForm(r);
                             }, // 自定义事件
                         },
                     ],
                 },
             },
-            fiveTable: {
+            fivelabel: {
                 name: "five",
                 titledata: [
                     {
@@ -588,11 +592,6 @@ export default {
                         prop: "proposer_time",
                         width: 300,
                     },
-                    // {
-                    //   label: "工单状态",
-                    //   prop: "taskName",
-                    //   width: 200,
-                    // },
                 ], //表格头
                 data: [], //内容数据
                 loading: true,
@@ -837,11 +836,11 @@ export default {
                 this.getMeLaunch()
             }
             if (this.clickTagName == 'four') {
-                this.fourTable.pageData.pageNum = e;
+                this.fourlabel.pageData.pageNum = e;
                 this.getToBeRead()
             }
             if (this.clickTagName == 'five') {
-                this.fiveTable.pageData.pageNum = e;
+                this.fivelabel.pageData.pageNum = e;
                 this.getBeReadList()
             }
         },
@@ -979,6 +978,27 @@ export default {
         handleClose() {//关闭弹窗
             this.dialogStatus = false;
             this.fromList = {};
+            this.usernumber()
+            if (this.clickTagName == 'first') {
+                this.lableTable = this.firstlabel
+                this.getQueryList();
+            }
+            if (this.clickTagName == 'two') {
+                this.lableTable = this.twolabel
+                this.getQueryDone();
+            }
+            if (this.clickTagName == 'three') {
+                this.lableTable = this.threelabel
+                this.getMeLaunch()
+            }
+            if (this.clickTagName == 'four') {
+                this.lableTable = this.fourlabel
+                this.getToBeRead()
+            }
+            if (this.clickTagName == 'five') {
+                this.lableTable = this.fivelabel
+                this.getBeReadList()
+            }
         },
         async clickSave() {
             this.$refs.form.validate((valid) => {
@@ -1185,11 +1205,11 @@ export default {
                 this.getMeLaunch()
             }
             if (this.clickTagName == 'four') {
-                this.lableTable = this.fourTable
+                this.lableTable = this.fourlabel
                 this.getToBeRead()
             }
             if (this.clickTagName == 'five') {
-                this.lableTable = this.fiveTable
+                this.lableTable = this.fivelabel
                 this.getBeReadList()
             }
         },
@@ -1211,11 +1231,11 @@ export default {
                 this.getMeLaunch()
             }
             if (this.clickTagName == 'four') {
-                this.lableTable = this.fourTable
+                this.lableTable = this.fourlabel
                 this.getToBeRead()
             }
             if (this.clickTagName == 'five') {
-                this.lableTable = this.fiveTable
+                this.lableTable = this.fivelabel
                 this.getBeReadList()
             }
         },
@@ -1310,12 +1330,12 @@ export default {
             getTodoBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
                 this.tabListMain[0].number = res.data.totalRecord
             });
-            queryReadBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
-                this.tabListMain[3].number = res.data.totalRecord
-            });
-            queryReadDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
-                this.tabListMain[4].number = res.data.totalRecord
-            });
+            // queryReadBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+            //     this.tabListMain[3].number = res.data.totalRecord
+            // });
+            // queryReadDoneBase(this.pageNo, "", { tableName: this.tableName, }).then((res) => {
+            //     this.tabListMain[4].number = res.data.totalRecord
+            // });
         }
     },
     created() {

src/pages/main/provincialWorkOrder/provincialWorkOrderArea.vue

@@ -204,7 +204,7 @@ export default {
             pageNo: 1,//页码
             destroy: false,//处理
             handleStatus: false,//处理
-            tableName: "tygd_pro_process",
+            tableName: "tygd_cit_process",
 
             request_form: {
                 userId: "",
@@ -218,9 +218,9 @@ export default {
                 processDefinitionKey: "tygd_cit_process",//流程key
             },
             requestForm: {
-                fresourceId: "a682dc9f-2fea-11ed-a6ed-02427ba2d388", // 本地环境
+                // fresourceId: "a682dc9f-2fea-11ed-a6ed-02427ba2d388", // 本地环境
                 // fresourceId: "canvas", // 生产环境
-                // fresourceId: "4fdbb96e-8bfd-11ed-8988-00505687dcd3", //测试91环境
+                fresourceId: "33b0af93-b1ce-11ed-be6b-00505687dcd3", //测试91环境
                 processDefinitionKey: "tygd_cit_process",
             },
             dialogStatus: false, //dialog显示
@@ -802,6 +802,19 @@ export default {
         handleClose() {//关闭弹窗
             this.dialogStatus = false;
             this.fromList = {};
+            this.usernumber()
+            if (this.clickTagName == 'first') {
+                this.lableTable = this.firstlabel
+                this.getQueryList();
+            }
+            if (this.clickTagName == 'two') {
+                this.lableTable = this.twolabel
+                this.getQueryDone();
+            }
+            if (this.clickTagName == 'three') {
+                this.lableTable = this.threelabel
+                this.getMeLaunch()
+            }
         },
         async clickSave() {
             this.$refs.form.validate((valid) => {

src/router/index.js

@@ -2212,6 +2212,18 @@ const routes = [{
             name: 'documentCollectionApprovalExcel',
             component: (resolve) => require( /* webpackChunkName: "system" */['../pages/main/documentCollection/documentCollectionApprovalExcel'], resolve)
         },
+        {
+            path: '/provincialWorkOrder',
+            name: 'provincialWorkOrder',
+            component: resolve => require(['../pages/main/provincialWorkOrder/provincialWorkOrder.vue'], resolve),
+            meta: { title: '省-通用工单' }
+        },
+        {
+            path: '/provincialWorkOrderArea',
+            name: 'provincialWorkOrderArea',
+            component: resolve => require(['../pages/main/provincialWorkOrder/provincialWorkOrderArea.vue'], resolve),
+            meta: { title: '地市-通用工单' }
+        }
     ]
 },
 {

vue.config.js

@@ -134,9 +134,9 @@ module.exports = {
                 // target: 'http://127.0.0.1:9600/',
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.44:9600/',
-                target: 'http://192.168.2.43:9600',
+                // target: 'http://192.168.2.92:9600',
                 // target: "http://124.223.66.248:9600",
-                // target: "http://43.138.50.94:9600",
+                target: "http://43.138.50.94:9600",
                 changeOrigin: true,
             },
         },

yarn.lock

@@ -3179,7 +3179,7 @@ console-browserify@^1.1.0:
 
 console@^0.7.2:
   version "0.7.2"
-  resolved "https://registry.yarnpkg.com/console/-/console-0.7.2.tgz#f9a4331249291591b7bf9bffa8e205356f20a9f0"
+  resolved "https://registry.npmmirror.com/console/-/console-0.7.2.tgz#f9a4331249291591b7bf9bffa8e205356f20a9f0"
   integrity sha512-+JSDwGunA4MTEgAV/4VBKwUHonP8CzJ/6GIuwPi6acKFqFfHUdSGCm89ZxZ5FfGWdZfkdgAroy5bJ5FSeN/t4g==
 
 consolidate@^0.15.1: