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

pages/produce/execute/starOrder/index.vue

@@ -128,7 +128,14 @@ export default {
             if (r.result.productId && r.result.productId > 0) {
               ApiTech.get({ id: r.result.productId }).then(res => {
                 if (res.success && res.result) {
+                  if(res.result.productUrlList&& res.result.productUrlList.length>0)
+                  {
                   this.eid = res.result.productUrlList;
+                  }
+                  else
+                  {
+                    this.eid=this.$u.guid();
+                  }
                   //查询上传到文件服务器上的文件
                   let parms = {
                     app: "technology",
@@ -140,9 +147,11 @@ export default {
                     if (res1.data != [] && res1.data.length > 0) {
                       this.images = [];
                       res1.data.forEach(datas => {
-                        this.images.push(this.downUrl+datas.downloadPath)
+                        let objImag = {};
+                        objImag.thumbnail=this.downUrl+datas.downloadPath
+                        objImag.source=this.downUrl+datas.downloadPath
+                        this.images.push(objImag)
                       });
-                       alert(JSON.stringify(this.images))
                     }
                   });
                   

pages/technology/search.vue

 <template>
   <Form ref="form" :model="condition" :label-width="100">
     <Row>
+      <Col :span="12" v-if="condition.id.show">
+        <FormItem :label="编号" prop="id">
+          <Input v-model="condition.id.value"></Input>
+        </FormItem>
+      </Col>
       <Col :span="12" v-if="condition.classId.show">
         <FormItem :label="l('classId')" prop="classId">
           <Input v-model="condition.classId.value"></Input>
@@ -151,6 +156,7 @@ export default {
       condition: {
         creationTime: { op: "Range", value: null, show: true },
         creatorUserId: { op: "Equal", value: null, show: true },
+        id: { op: "Equal", value: null, show: true },
         lastModificationTime: { op: "Range", value: null, show: true },
         lastModifierUserId: { op: "Equal", value: null, show: true },
         classId: { op: "Equal", value: null, show: false },