Merge branch 'product-kk' into product

assets/css/base.less

@@ -1237,12 +1237,12 @@ html [type=button] {
   left: 0;
   text-align: center;
   padding: 20px 0;
-  background: #d0d2d9;
+  background: #08080894;
 
   div {
     height: 25px;
     font-size: 14px;
-    color: #333;
+    color: #ffffff;
     line-height: 28px;
 
   }

assets/css/iview-reset.less

@@ -165,6 +165,11 @@
     padding: 10px 12px 10px 0;
     box-sizing: border-box;
 }
+.footers{
+    .ivu-form .ivu-form-item-label{
+      color: white;
+    }
+  }
 
 .ivu-input {
     font-size: 14px;

i18n/locale/zh-CN.js

@@ -603,9 +603,9 @@ export default {
     currentNodeName: '当前环节',
     nextNodeId: '下一环节Id',
     nextNodeName: '下一环节',
-    creatorUserId: '创建用户Id',
-    creator: '创建人',
-    creationTime: '创建时间',
+    creatorUserId: '发起用户Id',
+    creator: '发起人',
+    creationTime: '发起时间',
   },
   processList: { //工艺规程列表
     id: 'id',

pages/handle/examine13/detail.vue

+<style lang="less" scope>
+@import "../shen.less";
+</style>
 <template>
-  <div class="new-detail" style="width:90%;margin:0 auto">
+  <div class="new-detail">
     <Row>
       <Filed :span="8" name="编码：">{{!entity.code?'未分配':entity.code}}</Filed>
       <Filed :span="8" name="名称：">{{entity.name}}</Filed>
@@ -11,7 +14,7 @@
       </Filed>
       <Filed :span="8" name="描述：">{{entity.description}}</Filed>
     </Row>
-    <Divider orientation="left">扩展属性</Divider>
+    <Divider orientation="center"><h3>扩展属性</h3></Divider>
     <Row>
       <Filed v-for="li in fileds" :key="li.field" :span="li.span" :name="li.title+'：'">
         <State v-if="li.dataType==3" :code="li.note" :value="entity[li.field]" />

pages/handle/footer.vue

@@ -288,3 +288,11 @@ export default {
   watch: {}
 }
 </script>
+<style lang="less">
+// .footers{
+//   .ivu-form .ivu-form-item-label{
+//     color: white!important;
+//   }
+// }
+
+</style>
\ No newline at end of file

pages/handle/index.vue

+
 <template>
   <div class="myBug">
     <Tabs :animated="false" @on-click="tab" value="3">
@@ -103,6 +104,29 @@ export default {
           key: "schemaId",
           hide: true
         },
+        {
+          title: this.l("status"),
+          key: "status",
+          align: "center",
+          width: 120,
+          high: true,
+          code: "Handle.todoList.status"
+        },
+        {
+          title: this.l("creatorUserId"),
+          key: "creatorUserId",
+          hide: true
+        },
+        {
+          title: this.l("creator"),
+          key: "creator",
+          align: "center"
+        },
+        {
+          title: this.l("creationTime"),
+          key: "creationTime",
+          align: "center"
+        },
         {
           title: this.l("schemaName"),
           key: "schemaName"
@@ -135,27 +159,6 @@ export default {
           title: this.l("nextNodeName"),
           key: "nextNodeName"
         },
-        {
-          title: this.l("status"),
-          key: "status",
-          high: true,
-          code: "Handle.todoList.status"
-        },
-        {
-          title: this.l("creatorUserId"),
-          key: "creatorUserId",
-          hide: true
-        },
-        {
-          title: this.l("creator"),
-          key: "creator",
-          align: "center"
-        },
-        {
-          title: this.l("creationTime"),
-          key: "creationTime",
-          align: "center"
-        },
 
         {
           title: "操作",

pages/handle/process.vue

+<style lang="less" scope>
+@import "./shen.less";
+</style>
 <template>
   <div class="Design">
     <h3>{{ processTitle }}</h3>
@@ -10,7 +13,6 @@
           {{ item.name }} &nbsp;(
           <state code="workflow.form.audit.type" :value="item.operation" />)
           <Icon v-if="item.isFixed" title="固定" type="ios-lock" />
-          <span class="auditedTime">{{item.auditedTime}}</span>
         </p>
         <div class="content">
           <div class="records" v-if="index==cur">
@@ -22,30 +24,16 @@
               class="mr5"
             />
           </div>
-          <div v-else-if="index>cur">
-             <CheckboxGroup v-model="immutData">
-              <span>审批人：</span>
-              <Checkbox
-                v-for="(item1, index1) in item.defaultUsers.immutable"
-                :key="index1"
-                :label="item1"
-                :disabled="item.isFixed"
-              >
-                <User :value="item1" style="margin-right:5px;" />
-              </Checkbox>
-            </CheckboxGroup>
-          </div>
-          <div class="wait" v-else>
-           <span>审批人：</span>
-            <User
-              v-for="(item2, index2) in item.defaultUsers.immutable"
-              :key="index2"
-              :value="item2"
-              class="mr5"
-            />
-          </div>
           <div style="width:98%" v-if="com(item.records).length>0">
-            <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table>
+            <!-- <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table> -->
+            <p class="shen_row" v-for="(item3, index3) in item.records" :key="index3" :value="item3">
+              <User class="user_span" :value="item3.operatorId"/>
+              <span class="plr row_time">{{item3.operationTime}}</span>
+              <state code="workflow.record.status" :value="item3.status" type="text"></state>
+              <span class="plr remark" v-if="item3.remark">{{item3.remark}}</span>
+              <a class="plr row_ditill" v-if="item3.contextData" @click="edit(item3)">详情</a>
+              <!-- <span>{{item3.contextData}}</span> -->
+            </p>
           </div>
         </div>
       </TimelineItem>
@@ -57,12 +45,16 @@ import Api from './api'
 export default {
   name: 'process',
   components: {},
+  async fetch({ store, params }) {
+    await store.dispatch('loadDictionary') // 加载数据字典
+  },
   data() {
     return {
       currentUserId: 0,
       processTitle: '审批流程',
       currentNodeId: null,
       dataImmut: [],
+      creatRows: [],
       cur: 0,
       columns: [
         {
@@ -136,8 +128,8 @@ export default {
     Api.getdetail({ Id: this.idVal }).then((r) => {
       if (r.success) {
         this.dataImmut = r.result.nodes
-        this.processTitle = r.result.schemaName
         this.currentNodeId = r.result.currentNodeId
+        let idUser = []
         r.result.nodes.map((u, i) => {
           //查找当前节点索引 
           if (u.id == this.currentNodeId) {
@@ -152,6 +144,7 @@ export default {
           // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
           this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug
         }
+
       } else {
         this.$Message.error('加载失败')
       }
@@ -178,8 +171,8 @@ export default {
     com(items) {
       if(items)
         return items.filter((u) => {
-        return [2, 3, 5,6].indexOf(u.status) > -1
-      })
+          return [2, 3, 5, 6].indexOf(u.status) > -1
+        })
       else 
       return [];
     },
@@ -191,12 +184,4 @@ export default {
   computed: {},
   watch: {}
 }
-</script>
-<style lang="less">
+</script>
\ No newline at end of file
-.Design{
-  margin:20px auto; width:90%;
-  .ivu-timeline-item-head{
-    background-color: transparent;
-  }
-}
-</style>
\ No newline at end of file

pages/handle/processold.vue

+<style lang="less" scope>
+@import "./shen.less";
+</style>
+<template>
+  <div class="Design">
+    <h3>{{ processTitle }}</h3>
+    <Divider />
+    <Timeline>
+      <TimelineItem v-for="(item, index) in dataImmut" :key="index">
+        <Badge :count="index + 1" slot="dot" :type="type(index)"></Badge>
+        <p class="title">
+          <state code="workflow.record.status" :value="item.status" type="tag" />
+          {{ item.name }} &nbsp;(
+          <state code="workflow.form.audit.type" :value="item.operation" />)
+          <Icon v-if="item.isFixed" title="固定" type="ios-lock" />
+          <!-- <span class="auditedTime">{{item.auditedTime}}</span> -->
+        </p>
+        <div class="content">
+          <div class="records" v-if="index==cur">
+             <span>审批人：</span>
+            <User
+              v-for="(item3, index3) in item.records"
+              :key="index3"
+              :value="item3.operatorId"
+              class="mr5"
+            />
+          </div>
+          <div v-else-if="index>cur">
+             <CheckboxGroup v-model="immutData">
+              <span>审批人：</span>
+              <Checkbox
+                v-for="(item1, index1) in item.defaultUsers.immutable"
+                :key="index1"
+                :label="item1"
+                :disabled="item.isFixed"
+              >
+                <User :value="item1" style="margin-right:5px;" />
+              </Checkbox>
+            </CheckboxGroup>
+          </div>
+          <div class="wait" v-else>
+           <span>审批人：</span>
+            <User
+              v-for="(item2, index2) in item.defaultUsers.immutable"
+              :key="index2"
+              :value="item2"
+              class="mr5"
+            />
+          </div>
+          <div style="width:98%" v-if="com(item.records).length>0">
+            <Table :columns="columns" border size="small" width="90%" :data="com(item.records)"></Table>
+            <p>
+              <state code="workflow.record.status" :value="item.status" type="text"></state>
+              <!-- <User :value="item.operatorId" class="mr5"/> -->
+              <span>{{item.auditedTime}}</span>
+              <!-- <span>{{item}}</span> -->
+            </p>
+          </div>
+        </div>
+      </TimelineItem>
+    </Timeline>
+  </div>
+</template>
+<script>
+import Api from './api'
+export default {
+  name: 'process',
+  components: {},
+  async fetch({ store, params }) {
+    await store.dispatch('loadDictionary') // 加载数据字典
+  },
+  data() {
+    return {
+      currentUserId: 0,
+      processTitle: '审批流程',
+      currentNodeId: null,
+      dataImmut: [],
+      cur: 0,
+      columns: [
+        {
+          key: 'status',
+          title: '结果',
+          align: 'left',
+          width: 100,
+          render: (h, params) => {
+            return h('state', {
+              attrs: {
+                value: params.row.status,
+                code: 'workflow.record.status'
+              }
+            })
+          }
+        },
+        {
+          key: 'operatorId',
+          title: '操作人',
+          align: 'left',
+          width: 100,
+          easy: true,
+          high: true,
+          render: (h, params) => {
+            return h('User', { attrs: { value: params.row.operatorId } })
+          }
+        },
+        {
+          title: '时间',
+          key: 'operationTime',
+          width: 200,
+          align: 'center'
+        },
+        {
+          title: '备注',
+          key: 'remark',
+          align: 'center'
+        },
+        {
+          key: 'contextData',
+          title: '详细',
+          width: 100,
+          align: 'left',
+          render: (h, params) => {
+            if (params.row.contextData.length > 2)
+              return h(
+                'a',
+                { on: { click: () => this.edit(params.row) } },
+                '详情'
+              )
+            return h('span', '')
+          }
+        }
+      ],
+      dataMut: [],
+      immutData: [],
+      schemaId: ''
+    }
+  },
+  props: {
+    idVal: {
+      type: String,
+      default: ''
+    }
+  },
+  created() {
+    this.currentUserId=this.$store.state.userInfo.userId
+    this.dataImmut = []
+    this.dataMut = []
+
+    Api.getdetail({ Id: this.idVal }).then((r) => {
+      if (r.success) {
+        this.dataImmut = r.result.nodes
+        this.processTitle = r.result.schemaName
+        this.currentNodeId = r.result.currentNodeId
+        r.result.nodes.map((u, i) => {
+          //查找当前节点索引 
+          if (u.id == this.currentNodeId) {
+            this.cur = i
+          };
+          // if(u.defaultUsers.mutable&&u.defaultUsers.mutable.length>0){
+            // u.defaultUsers.immutable=u.defaultUsers.immutable.concat(u.defaultUsers.mutable)
+            u.defaultUsers.immutable=u.defaultUsers.immutable||(u.defaultUsers.mutable)//审核人员bug
+          // }
+        })
+        if (this.dataImmut.length > this.cur + 1) {
+          // console.log("this.dataImmut[this.cur + 1]:",this.dataImmut[this.cur + 1],this.cur,this.dataImmut.length )
+          this.immutData = this.dataImmut[this.cur + 1].defaultUsers.immutable||(this.dataImmut[this.cur + 1].defaultUsers.mutable)//审核人员bug
+        }
+      } else {
+        this.$Message.error('加载失败')
+      }
+    })
+  },
+  methods: {
+    load(v) {},
+    type(i) {
+      if (i < this.cur) {
+        return 'primary'
+      } else if (i == this.cur) {
+        return 'info'
+      } else if (i == this.cur + 1) {
+        return 'warning'
+      } else {
+        return 'normal'
+      }
+    },
+    edit(record) {
+      // alert(record.id)
+      this.$emit('node-click', record)
+      console.log(record)
+    },
+    com(items) {
+      if(items)
+        return items.filter((u) => {
+          return [2, 3, 5, 6].indexOf(u.status) > -1
+        })
+      else 
+      return [];
+    },
+    l(key) {
+      key = 'orderInfo' + '.' + key
+      return this.$t(key)
+    }
+  },
+  computed: {},
+  watch: {}
+}
+</script>
\ No newline at end of file

pages/handle/shen.less

+.new-detail{
+    margin: 0 auto;
+    width: 98%;
+    background: #fff;
+    box-shadow: 0px 2px 6px rgba(0,0,0,0.16);
+}
+.Design{
+    margin:20px auto;
+    width: 98%;
+    padding: 20px;
+    background: #fff;
+    box-shadow: 0px 2px 6px rgba(0,0,0,0.16);
+    .ivu-timeline-item-head{
+        background-color: transparent;
+    }
+    .shen_row{
+        border-bottom: 1px solid #ccc;
+        line-height: 30px;
+        padding: 0 0 0 5px;
+        .user_span{
+            max-width: 150px;
+            width: 120px;
+        }
+        .row_time{
+            width: 180px;
+        }
+        .row_ditill{
+            width: 150px;
+        }
+        .plr{
+            display: inline-block;
+            padding: 0 20px;
+        }
+        .remark{
+            max-width: 1260px;
+            min-width: 100px;
+
+        }
+    }
+  }
\ No newline at end of file