Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

assets/css/themes/default.less

 //-------------蓝色----------- 
-
+@Theme: rgba(38, 128, 235, 1);
 //滚动条颜色
 @scrollbar-track-bg-color: rgb(239, 239, 239);
 @scrollbar-thumb-bg-color: rgba(38, 128, 235, 0.5);

components/page/dateRange.vue

@@ -87,8 +87,10 @@ export default {
     handleChange(date, t) {
       if (date.length == 2) {
         this.value3 = date;
-        this.value[this.start] = date[0];
-        this.value[this.end] = dayjs(date[1]).format("YYYY-MM-DD 23:59:59");
+        // this.value[this.start] = date[0];
+        // this.value[this.end] = dayjs(date[1]).format("YYYY-MM-DD 23:59:59");
+        this.$set(this.value,this.start,date[0])
+        this.$set(this.value,this.end,dayjs(date[1]).format("YYYY-MM-DD 23:59:59"))
         this.$emit("on-change", this.value);
       }
       this.open = false;

components/page/user.vue

 <template>
   <Poptip placement="bottom-start" trigger="hover" width="240" transfer>
-    <label :class="css">{{ user.name }}</label>
+    <label v-if="mode=='text'" :class="css">{{ user.name }}</label>
+    <Avatar v-else  :style="{background:user.gender=='男'?'#1479D7':'red'}"
+        :icon="user.gender=='男'?'md-person':'md-woman'" shape="square" :src="img">{{user.name}}</Avatar>
     <div slot="content">
       <Avatar v-if="user.face" size="large" :src="img"></Avatar>
       <Avatar
@@ -31,6 +33,13 @@ export default {
       type: [Number, String],
       default: 0,
     },
+    mode:{
+      type:String,
+      default:"text",
+      validator:(v)=>{
+        return ["text","face"].indexOf(v)>-1
+      }
+    }
   },
   data() {
     return {

i18n/locale/zh-CN.js

@@ -2042,6 +2042,8 @@ document_category: {
         startDate: '开始日期',
         endDate: '结束日期',
         businessUnits: '业务单位',
+        date: '计划日期',
+        users: '成员',
     },
     //项目任务
     project_task: {

libs/henq.js

@@ -2,30 +2,48 @@ import XLSX from 'xlsx';
 import Api from '@/plugins/request'
 let henq = {};
 let pdfInfo = ''
-henq.clone = (obj) => {
+henq.clone = (data)=> {
   var that = henq
-  var o
-  if (typeof obj === 'object') {
-    if (obj === null) {
-      o = null
-    } else {
-      if (obj instanceof Array) {
-        o = []
-        for (var i = 0, len = obj.length; i < len; i++) {
-          o.push(that.clone(obj[i]))
-        }
-      } else {
-        o = {}
-        for (var j in obj) {
-          o[j] = that.clone(obj[j])
-        }
-      }
-    }
+  const t = that.type(data);
+  let o;
+  let i;
+  let ni;
+  if (t === "array") {
+    o = [];
+  } else if (t === "object") {
+    o = {};
   } else {
-    o = obj
+    return data;
+  }
+  if (t === "array") {
+    for (i = 0, ni = data.length; i < ni; i++) {
+      o.push(that.clone(data[i]));
+    }
+    return o;
+  }
+  if (t === "object") {
+    for (i in data) {
+      o[i] = that.clone(data[i]);
+    }
+    return o;
   }
-  return o
 }
+henq.type=(obj) =>{
+  const { toString } = Object.prototype;
+  const map = {
+    "[object Boolean]": "boolean",
+    "[object Number]": "number",
+    "[object String]": "string",
+    "[object Function]": "function",
+    "[object Array]": "array",
+    "[object Date]": "date",
+    "[object RegExp]": "regExp",
+    "[object Undefined]": "undefined",
+    "[object Null]": "null",
+    "[object Object]": "object",
+  };
+  return map[toString.call(obj)];
+},
 henq.merge = () => {
   Object.assign(argments)
 }

pages/produce/execute/judgment/index.vue

@@ -134,32 +134,6 @@ export default {
             fanlist: [],
             feilist: [],
             titleCode: '', //送审单号
-            problemList: [{
-                    problem: "问题描述01",
-                    id: 1
-                },
-                {
-                    problem: "问题描述02",
-                    id: 2
-                },
-                {
-                    problem: "问题描述03",
-                    id: 3
-                }
-            ],
-            blameList: [{
-                    user: "责任人01",
-                    id: 1
-                },
-                {
-                    user: "责任人02",
-                    id: 2
-                },
-                {
-                    user: "责任人03",
-                    id: 3
-                }
-            ]
         };
     },
     created() {

pages/project/plan/index.vue

 <template>
   <div>
     <Card>
-      <EditGrid :columns="columns" ref="grid" :items="list">
+      <EditGrid :columns="columns" ref="grid" :items="list" :level="8" :drag="true" >
         <template slot="easySearch"
           ><Form ref="formInline" :model="easySearch" inline
             ><FormItem prop="keys"
@@ -86,6 +86,26 @@ export default {
         // { key:"projectId",title:this.l("projectId")   ,align:"left"    ,high:true  },
         // { key:"upId",title:this.l("upId")   ,align:"left"    ,high:true  },
         // { type: "selection", width: 80, align: "center" },
+        {
+          key:"drag",
+         type:"drag",
+         width:50,  
+         align:'center'
+        },
+         {
+          key: "upId",
+          width: 50,
+          type:"selection",
+           align:'center'
+        },
+        {
+          key: "title",
+          title: this.l("title"),
+          align: "left",
+          tree: true,
+          easy: true,
+          high: true,
+        },
         {
           key: "type",
           width: 90,
@@ -106,14 +126,7 @@ export default {
           easy: true,
           high: true,
         },
-        {
-          key: "title",
-          title: this.l("title"),
-          align: "left",
-          tree: true,
-          easy: true,
-          high: true,
-        },
+        
         {
           key: "status",
           title: this.l("status"),

pages/project/project/detail.vue

@@ -3,17 +3,18 @@
     <div class="top-title">
         <div class="new-detail row-left">
             <Row>
-                <Filed :span="12" :name="l('title') + '：'">{{ entity.title }}</Filed>
-                <Filed :span="12" :name="l('state') + '：'">
+                <Filed :span="6" :name="l('title') + '：'">{{ entity.title }}</Filed>
+                <Filed :span="6" :name="l('state') + '：'">
                     <state code="project.main.state" :value="entity.state" />
                 </Filed>
                 <!-- <Filed :span="12" :name="l('phase')">{{ entity.phase }}</Filed> -->
-                <Filed :span="12" :name="l('startDate') + '：'">{{
-            entity.startDate
-          }}</Filed>
-                <Filed :span="12" :name="l('endDate') + '：'">{{
-            entity.endDate
-          }}</Filed>
+                <Filed :span="12" :name="l('date') + '：'">
+                    <DateRange v-model="entity"/>
+              </Filed>
+              <Filed :span="24" :name="l('users')+ '：'">
+                  <User :value="1" mode="face"/>
+                  <a><Avatar icon="md-add" size="24" /></a>
+              </Filed>
             </Row>
         </div>
         <ul>