Merge branch 'dev'

components/file/file-manage/FileManageCont.vue

@@ -17,7 +17,7 @@
       </Col>
       <!--列表-->
       <Col span="24">
-        <FilesList ref="fileModal" :fileName="fileName" @on-result-change="_fileData"></FilesList>
+        <FilesList ref="fileModal" :fileName="fileName" :viewUrl="urlData.downloadFileUrl" @on-result-change="_fileData"></FilesList>
       </Col>
     </Row>
     <!--删除提示框-->

components/file/file-manage/FilesList.vue

@@ -60,7 +60,7 @@
               fixed="right">
               <template slot-scope="scope">
                 <VXEIconList
-                  :msg="iconMsg"
+                  :msg="scope.row.type === 'jpg'||scope.row.type === 'pdf'||scope.row.type === 'png' ?iconMsgJpg:iconMsg"
                   @on-result-change="_iconClick" :rowData="scope.row"></VXEIconList>
               </template>
             </vxe-table-column>
@@ -145,7 +145,8 @@ import BatchUploadSample from './BatchUploadSample'
 export default {
   components: { BatchUpload, BatchUploadSample },
   props: {
-    fileName: null
+    fileName: null,
+    viewUrl: null
   },
   data() {
     return {
@@ -193,7 +194,7 @@ export default {
       Ids: [],
       smallUrl: global.staticURL + '/img/smallfile/',
       bigUrl: global.staticURL + '/img/bigfile/',
-      imgUrl: global.baseURL + '/soil/v1/entrust_annex/download/',
+      imgUrl: '',
       action: '',
       dataObj: {
         file: ''
@@ -234,6 +235,7 @@ export default {
       this.idsObj = idsObj
       this.urlData = data
       this.action = global.baseURL + data.uploadFileUrl + data.id
+      this.imgUrl = global.baseURL + data.downloadFileUrl
       this.downloadFileUrlFile = data.downloadFileUrl
       this.$nextTick(() => {
         this._page()
@@ -328,6 +330,12 @@ export default {
         case 'pdf':
           this.$pdfView(data.objectKey)
           break
+        case 'png':
+          const pngViewList = []
+          pngViewList.push(global.baseURL + this.downloadFileUrlFile + data.id)
+          this.imgViewList = pngViewList
+          this.imgViewIndex = 0
+          break
       }
       // console.log(data)
       // if (this.urlData.viewUri === '/meter/v1/entrust_attachment/preview/') {

components/flow/FlowBranch.vue

@@ -80,16 +80,16 @@ export default {
       // const list_0_value = this.list[0].value
       const listZeroValue = this.list[0].value
       // if (current_value) {
-      if (currentValue === false || currentValue === undefined) {
-        return undefined
+      if (currentValue === false) {
+        return false
       } else if (currentValue) {
         return endValue
       } else {
         // undefined,说明要接着向下走
         // eslint-disable-next-line no-lonely-if
-        if (listZeroValue !== undefined && endValue) {
+        if (listZeroValue === true && endValue) {
           return true
-        } else if (listZeroValue !== undefined && endValue === false) {
+        } else if (listZeroValue === false) {
           return false
         }
       }
@@ -102,7 +102,8 @@ export default {
 .flow-start-border {
   width: 2px;
   height: 133px;
-  background: #666;
+  /*background: #666;*/
+  background: #eb6877;
   position: absolute;
   top: 30px;
 }
@@ -112,6 +113,7 @@ export default {
 }
 
 .red-flow-start-border {
-  background: #eb6877;
+  /*background: #eb6877;*/
+  background: #666;
 }
 </style>

components/flow/PtArrow.vue

@@ -47,12 +47,14 @@ export default {
 <style scoped>
 .arrow-left {
   height: 2px;
-  background: #666;
+  /*background: #666;*/
+  background: #eb6877;
 }
 
 .arrow-right {
   border: 6px solid transparent;
-  border-left: 10px solid #666;
+  /*border-left: 10px solid #666;*/
+  border-left: 10px solid #eb6877;
   width: 0;
   height: 0px;
   margin-top: -5px;
@@ -74,7 +76,7 @@ export default {
 }
 
 .red-color-left {
-  background: #eb6877;
+  background: #666;
 }
 
 .blue-color-right {
@@ -82,6 +84,6 @@ export default {
 }
 
 .red-color-right {
-  border-left-color: #eb6877;
+  border-left-color: #666;
 }
 </style>

components/flow/PtCircle.vue

@@ -47,12 +47,14 @@ export default {
 .circle {
   width: 60px;
   height: 60px;
-  border: 1px solid #999;
-  background: #999;
+  /*border: 1px solid #999;*/
+  /*background: #999;*/
   color: #fff;
   border-radius: 50%;
   text-align: center;
   font-size: 12px;
+  border-color: #eb6877;
+  background-color: #eb6877;
 }
 
 .circle span {
@@ -76,8 +78,9 @@ export default {
 }
 
 .red-color {
-  border-color: #eb6877;
-  background-color: #eb6877;
+  /*border-color: #eb6877;*/
+  /*background-color: #eb6877;*/
   color: #fff;
+  background: #999;
 }
 </style>

components/flow/PtRect.vue

@@ -42,8 +42,9 @@ export default {
 
 <style scoped>
 .rect {
-  border: 1px solid #999;
-  background: #999;
+  border: 1px solid #eb6877;
+  /*background: #999;*/
+  background: #eb6877;
   color: #fff;
   font-size: 12px;
   width: 80px;
@@ -62,8 +63,9 @@ export default {
 }
 
 .red-color {
-  border-color: #eb6877;
-  background-color: #eb6877;
+  border-color: #999;
+  /*background-color: #eb6877;*/
+  background-color: #999;
   color: #fff;
 }
 </style>

pages/meter-entrust/entrust-register/EntrustRegister.vue

@@ -100,12 +100,13 @@ export default {
           type: 'success',
           id: '',
           name: '提交至评审'
-        },
-        {
-          type: 'success',
-          id: '',
-          name: '提交'
         }
+        // ,
+        // {
+        //   type: 'success',
+        //   id: '',
+        //   name: '提交'
+        // }
       ],
       iconMsg: [
         {

pages/workbench/flowIndex.vue

@@ -187,28 +187,21 @@ export default {
     // 上面连接线颜色
     upLineClassObj() {
       const valueZero = this.list.end[0].value
-      const upValue = this.list.branch[0][2].value
+      // const upValue = this.list.branch[0][2].value
       const upValueZero = this.list.branch[0][0].value
-      if (
-        upValue === undefined ||
-        upValueZero === undefined ||
-        upValue === false
-      ) {
-        return undefined
+      if (upValueZero === false) {
+        return false
       } else {
         return valueZero
       }
     },
     // 下面连接线颜色
     downLineClassObj() {
-      const valueZero = this.list.end[0].value
-      const downValue = this.list.branch[2][2].value
-      const downValueZero = this.list.branch[2][0].value
-      if (
-        downValue !== undefined ||
-        (downValue === undefined && downValueZero === undefined)
-      ) {
-        return undefined
+      const valueZero = this.list.end[0].value // true  报告编制
+      // const downValue = this.list.branch[2][2].value // false 高级自校版
+      const downValueZero = this.list.branch[2][0].value // false 高级
+      if (downValueZero === false) {
+        return false
       } else {
         return valueZero
       }
@@ -224,13 +217,20 @@ export default {
       const branchOne = this.list.branch[1][0].value
       const branchTwo = this.list.branch[2][0].value
       if (index === 2) {
-        if (branchZero !== undefined) {
-          return branchZero
+        if (branchZero !== false) {
+          if (
+            (branchZero === undefined) &
+            (branchOne === true || branchTwo === true)
+          ) {
+            return true
+          } else {
+            return branchZero
+          }
         }
-        if (branchOne !== undefined) {
+        if (branchOne !== false) {
           return branchOne
         }
-        if (branchTwo !== undefined) {
+        if (branchTwo !== false) {
           return branchTwo
         }
       } else {

pages/workbench/messagePanel.vue

@@ -3,9 +3,9 @@
     <Card style="width:100%">
       <div class="config_meta">
         <p class="fl">
-          消息通知 {{ total }}
+          消息通知
         </p>
-        <div class="fr" @click="_detail">
+        <div @click="_detail" class="fr">
           <Tooltip content="查看更多" placement="left">
             <Icon type="ios-more" size="30" color="#2d8cf0" style="cursor:pointer;" />
           </Tooltip>
@@ -13,27 +13,16 @@
         <div class="clear" />
       </div>
       <div style="width: 100%;">
-        <element-table
-          ref="pageTable"
-          :page-columns="pageColumns"
-          :table-height="tableHeight"
-          :get-page="tableData"
-          show-check-box
-          hide-page
-          @on-result-change="_tableResultChange"
-        >
-          <el-table-column
-            v-for="item in pageColumns"
-            :key="item.key"
-            show-overflow-tooltip
-            sortable
-            :prop="item.key"
-            :label="item.title"
-            :align="item.align"
-            :width="item.width"
-            :min-width="200"
-            :fixed="item.fixed?item.fixed:undefined"
-          >
+        <PTVXETableHeight ref="pageTable"
+                          :table-height="300"
+                    @on-result-change="_tableResultChange" :getPage="tableData" hide-checkbox="true">
+          <vxe-table-column
+                  :field="item.key"
+                  :title="item.title"
+                  :min-width="item.width?item.width:150"
+                  :fixed="item.fixed?item.fixed:undefined"
+                  v-for="item in pageColumns"
+                  :key="item.key" sortable>
             <template slot-scope="scope">
               <span v-if="item.datetime">
                 {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM'):'' }}
@@ -45,8 +34,8 @@
                 {{ scope.row[item.key] }}
               </span>
             </template>
-          </el-table-column>
-        </element-table>
+          </vxe-table-column>
+        </PTVXETableHeight>
       </div>
     </Card>
     <!--&lt;!&ndash;未完成检测项目列表&ndash;&gt;-->
@@ -68,7 +57,7 @@ export default {
         { title: '内容', key: 'content' },
         { title: '创建时间', key: 'ctime', datetime: true }
       ],
-      total: ''
+      formObj: {}
     }
   },
   computed: {
@@ -87,13 +76,11 @@ export default {
     _tableResultChange(msg) {},
     async _request() {
       this.$refs.pageTable._hideLoading()
-      const data = {
-        page: 1,
-        rows: 10
-      }
-      const result = await workbench.myMessagePage(data)
+      Object.assign(this.formObj, this.$refs.pageTable._searchParams())
+      const result = await workbench.myMessagePage(this.formObj)
       if (result) {
         this.tableData = result
+        this.$refs.pageTable._hideLoading()
       }
       // this.$store.dispatch('ManufactContract/messagePage', {page: 1, rows: 7}).then(() => {
       //   let tableData = this.$store.state.ManufactContract.page.records