Merge branch 'develop' of http://103.249.252.28:90/LAWS/laws-system-front-FOTON into develop

src/pages/processCenter/pages/creatProcess/bzrk/step2.vue

@@ -3,7 +3,7 @@
         <!--        标准入库流程-->
         <ProcessHeader toggle>
             <template slot="proName">标准入库流程</template>
-            <template slot="proNode">申请人发起流程</template>
+            <template slot="proNode">经理人审批</template>
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -703,8 +703,7 @@
                         pId: this.$route.query.prcId
                     }).then(res => {
                         if (res) {
-                            console.log(res);
+                          this.form = JSON.parse(res.mesg)
-                            resolve()
                         }
                     }).catch(e => {
                     })

src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue

@@ -179,6 +179,22 @@ export default {
       this.queryProcess()
     },
     queryProcess () { // 查询待办流程
+      this.$http.postData('lawss/activiti/doneProcess', {
+        current: this.pageNo,
+        size: this.$store.getters.userInfo.configContent,
+        userId: this.$store.getters.userInfo.userId,
+        prcName: this.searchForm.prcName,
+        prcType: parseInt(this.searchForm.prcType) || '',
+        prcNum: this.searchForm.prcNum
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        console.log(res)
+        this.processList = res.list || []
+        this.total = res.count
+      }, e => {
+      })
     },
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
@@ -195,6 +211,13 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 办理
+      this.$router.push({
+        name: 'ProcessDetail',
+        query: {
+          prcNum: row.prcNum,
+          tabsName: 'AlreadyProcess'
+        }
+      })
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
     ...mapActions(['setMenu'])

src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue

@@ -179,6 +179,23 @@ export default {
       this.queryProcess()
     },
     queryProcess () { // 查询待办流程
+      this.$http.postData('lawss/activiti/IssuedProcess',
+          {
+            current: this.pageNo,
+            size: this.$store.getters.userInfo.configContent,
+            userId: this.$store.getters.userInfo.userId,
+            prcName: this.searchForm.prcName,
+            prcType: parseInt(this.searchForm.prcType) || '',
+            prcNum: this.searchForm.prcNum
+          },
+          {
+            loading: 'loading',
+            _this: this
+          }, res => {
+            this.processList = res.list
+            this.total = res.count
+          }, e => {
+          })
     },
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
@@ -195,6 +212,13 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 办理
+      this.$router.push({
+        name: 'ProcessDetail',
+        query: {
+          prcNum: row.prcNum,
+          tabsName: 'AlreadySend'
+        }
+      })
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
     ...mapActions(['setMenu'])

src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue

@@ -124,7 +124,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '办理']">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -167,7 +167,7 @@ export default {
   methods: {
     handleCommand (command) {
       switch (command[1]) {
-        case '办理':
+        case '查看':
           this.dealWith(command[0])
           break
       }
@@ -179,6 +179,23 @@ export default {
       this.queryProcess()
     },
     queryProcess () { // 查询待办流程
+      this.$http.postData('lawss/activiti/allProcess',
+          {
+            current: this.pageNo,
+            size: this.$store.getters.userInfo.configContent,
+            userId: this.$store.getters.userInfo.userId,
+            prcName: this.searchForm.prcName,
+            prcType: parseInt(this.searchForm.prcType) || '',
+            prcNum: this.searchForm.prcNum
+          },
+          {
+            loading: 'loading',
+            _this: this
+          }, res => {
+            this.processList = res.list || []
+            this.total = res.count
+          }, e => {
+          })
     },
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
@@ -195,6 +212,13 @@ export default {
       this.queryProcess()
     },
     dealWith (row) { // 办理
+      this.$router.push({
+        name: 'ProcessDetail',
+        query: {
+          prcNum: row.prcNum,
+          tabsName: 'MonitorProcess'
+        }
+      })
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
     ...mapActions(['setMenu'])

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -199,7 +199,6 @@ export default {
               }, e => {
               })
     },
-
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1
       this.queryProcess()

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -179,6 +179,20 @@ export default {
       this.queryProcess()
     },
     queryProcess () { // 查询待办流程
+      this.$http.postData('lawss/activiti/queryTaskDraft', {
+            current: this.pageNo,
+            size: parseInt(this.$store.getters.userInfo.configContent),
+            userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
+            prcName: this.searchForm.prcName,
+            prcType: parseInt(this.searchForm.prcType) || ''
+          },
+          {
+            loading: 'loading',
+            _this: this
+          }, res => {
+            this.processList = res.list
+            this.total = res.count
+          })
     },
     selectProcessBtn () { // 搜索按钮
       this.pageNo = 1

src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue

@@ -71,7 +71,18 @@
       <div class="right">
       </div>
     </div>
+
+
+
+
     <div class="container">
+      <div class="non-content">
+        <el-tabs v-model="ifMaintaince" @tab-click="handleClick" style="height: 100%">
+          <el-tab-pane label="已维护" name="Maintenance">
+          </el-tab-pane>
+          <el-tab-pane label="未维护" name="notMaintenance"></el-tab-pane>
+        </el-tabs>
+      </div>
       <el-table
               ref="multipleTable"
               :data="localProTableList"
@@ -89,28 +100,28 @@
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="flatform"
+                prop="projectPlatfor"
                 align="center"
                 label="产品平台">
         </el-table-column>
         <el-table-column
-                prop="productNo"
+                prop="projectNumber"
                 align="center"
                 width="90"
                 label="项目编号">
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="productName"
+                prop="projectName"
                 align="center"
                 label="项目名称">
-          <template slot-scope="scope">
+<!--          <template slot-scope="scope">-->
-            <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.productName }}</a>
+<!--           <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.productName }}</a>&ndash;&gt;-->
-          </template>
+<!--          </template>-->
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="productTypeShow"
+                prop="projectClassification"
                 label="项目分类"
                 align="center"
                 min-width="120"
@@ -118,7 +129,7 @@
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="productBrandShow"
+                prop="projectStatus"
                 label="项目状态"
                 align="center"
                 min-width="120"
@@ -126,45 +137,45 @@
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="productBrandShow"
+                prop="projectGroup"
                 label="项目群"
                 min-width="120"
                 align="center"
         >
         </el-table-column>
         <el-table-column
-                prop="sopTime"
+                prop="projectStartDate"
                 label="项目计划开始日期"
                 min-width="120"
                 width="160"
                 align="center"
         >
-          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>
+<!--          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
         </el-table-column>
         <el-table-column
-                prop="sopTime"
+                prop="projectEndDate"
                 label="项目计划完成日期"
                 min-width="120"
                 width="160"
                 align="center"
         >
-          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>
+<!--          <template slot-scope="scope">{{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}</template>-->
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="targetMarketShow"
+                prop="currentNode"
                 align="center"
                 label="当前节点">
         </el-table-column>
         <el-table-column
-                prop="leftRight"
+                prop="projectLevel"
                 align="center"
                 label="项目级别">
-          <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>
+<!--          <template slot-scope="scope" v-if="scope.row.leftRight">{{(scope.row.leftRight === '1' ? '左驾': '右驾')}}</template>-->
         </el-table-column>
         <el-table-column
                 show-overflow-tooltip
-                prop="productManagerShow"
+                prop="projectManager"
                 align="center"
                 label="项目经理">
         </el-table-column>
@@ -234,6 +245,9 @@ export default {
   },
   data () {
     return {
+      //默认返回已维护
+      ifMaintaince:"Maintenance",
+
       deptUser: [],
       // 查询条件
       localProTableSearch: {
@@ -710,7 +724,7 @@ export default {
     },
     // 切换tabs
     handleClick (tab, event) {
-      this.localProEO.prodectCode = this.activeName
+      this.localProEO.prodectCode = this.ifMaintaince
       this.insideHandleClick()
     },
     insideHandleClick (tab, event) {
@@ -1077,13 +1091,15 @@ export default {
     },
     // 查询本地产品
     getLocalProductTable () {
-      this.localProTableSearch.prodectCode = this.activeName
+      this.localProTableSearch.prodectCode = this.ifMaintaince
+      console.log(this.localProTableSearch.prodectCode)
       this.localProTableSearch.dataType = this.insideTabsActiveName
       this.SarExportSearchEo = this.localProTableSearch
-      this.$http.get('lawss/sarProductInfo/getProductInfoPage', this.localProTableSearch, {
+      this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
         _this: this, loading: 'loading'
       }, res => {
-        this.localProTableList = res.data.list
+        console.log(res.data)
+        this.localProTableList = res.data.Maintenance.records
         this.total = res.data.count
         // this.localProTableList.map((item) => {
         //   this.xmztOptions.map((opr) => {