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

components/page/files.vue

 <!--一次可上传多个文件 -->
 <template>
   <div>
+    <div v-show="showList">
       <Upload
         :action="postUrl"
         :on-success="uploadSuccess"
@@ -26,9 +27,10 @@
         >文件格式：{{formatList.join()}}；文件最大：{{maxSize}}k</span>
       </Upload>
       <Progress :percent="per" :stroke-width="5" v-show="vshowPro" />
+    </div>
+
     <div v-if="Photo">
       <Tag
-  
         v-for="(item,index) in nameList"
         :key="index"
         :name="item.id"
@@ -51,7 +53,7 @@
         <template>
           <img :src="downUrl+item.filePath" />
         </template>
-        <div class="demo-upload-list-cover">
+        <div class="demo-upload-list-cover" v-show="showList">
           <Icon type="ios-eye" @click.native="seeFile(item.filePath)"></Icon>
           <Icon type="ios-trash-outline" @click.native="handleClose2($event,item.id)"></Icon>
         </div>
@@ -80,6 +82,7 @@ export default {
       per: 0,
       vshowPro: false,
       Photo: true,
+      showList: true,
       isactive: 0
     };
   },
@@ -118,6 +121,10 @@ export default {
     Photos: {
       type: Boolean,
       default: false
+    },
+    showList: {
+      type: Boolean,
+      default: true
     }
   },
   methods: {
@@ -245,7 +252,7 @@ export default {
       //查询上传到文件服务器上的文件
       this.$http.sysUser.getFile(this.parms).then(res => {
         if (res.data != [] && res.data.length > 0) {
-          var items=[]
+          var items = [];
           res.data.forEach(data => {
             let objImag = {};
             objImag.fileName = data.fileName;
@@ -253,7 +260,7 @@ export default {
             objImag.id = data.id;
             items.push(objImag);
           });
-          this.nameList=items;
+          this.nameList = items;
         }
       });
     },
@@ -318,8 +325,8 @@ export default {
       this.nameList = [];
       this.nameList = v;
     },
-    "parms.eid"(v){
-      if(v){
+    "parms.eid"(v) {
+      if (v) {
         this.intFiles();
       }
     }
@@ -327,8 +334,7 @@ export default {
   mounted() {
     this.formatL();
     this.mutipleStatu();
-    if(this.parms.eid){
-      
+    if (this.parms.eid) {
       this.intFiles();
     }
     if (this.Photos === true) {

pages/technology/productMix/index.vue

 <template>
   <div class="product-mix">
     <Layout>
-      <Sider width="300">
-        <!-- <h4>产品列表</h4> -->
+      <Sider width="300" v-if="showMenu">
         <div class="p-list">
-          <!-- <Input search enter-button placeholder="请输入产品名称" /> -->
           <ProductTree @on-hide="onHide" @on-select="productSearch" />
         </div>
       </Sider>
-      <Content>
+      <div v-if="!showMenu" class="show_menu">
+        <a class="menu_play fr" @click="showMenuFn" title="展开">
+          <Icon type="ios-arrow-forward" size="24" />
+        </a>
+      </div>
+      <Content :class="!showMenu?'con_bord':''">
         <Product :parent="parent" />
       </Content>
     </Layout>
@@ -28,10 +31,15 @@ export default {
         id: null,
         parentName: "",
         ids: ""
-      }
+      },
+      showMenu: true
     };
   },
   methods: {
+    showMenuFn() {
+      //this.$Message.info("展开左侧树")
+      this.showMenu = true;
+    },
     productSearch(id, item, ids) {
       this.parent.parentName = item.title;
       this.parent.id = id;
@@ -49,11 +57,12 @@ export default {
 <style lang="less" >
 .product-mix {
   font-family: Microsoft YaHei;
-  height: 84vh;
+
   .ivu-layout-sider {
     background: rgba(255, 255, 255, 1);
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
+    height: 87vh;
 
     h4 {
       height: 30px;
@@ -61,17 +70,39 @@ export default {
       background: #eee;
       padding-left: 10px;
     }
-    // .p-list {
-    //   // padding: 10px;
-    //   overflow: auto;
-    // }
+  }
+  .show_menu {
+    width: 30px;
+    height: 30px;
+    position: fixed;
+    top: 100px;
+    left: 0;
+    z-index: 9;
+    .menu_play {
+      width: 30px;
+      height: 30px;
+      line-height: 34px;
+      font-size: 14px;
+      text-align: center;
+      color: #515a6e;
+      border-top-right-radius: 5px;
+      border-bottom-right-radius: 5px;
+      background: #ffffff;
+      box-shadow: #ccc 2px 2px 4px 1px;
+    }
+    .menu_play:hover {
+      background-color: #2d8cf0;
+      color: white;
+    }
   }
   .ivu-layout-content {
-    margin-left: 5px;
+    // margin-left: 5px;
     background: rgba(255, 255, 255, 1);
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;
+    height: 87vh;
+    overflow-y: hidden;
   }
 }
 </style>
\ No newline at end of file

pages/technology/productMix/product/detail.vue

@@ -10,9 +10,18 @@
       <Filed :span="12" :name="l('madeCompany')">{{entity.madeCompanyTitle}}</Filed>
       <!-- <Filed :span="12" :name="l('extend')">{{entity.extend}}</Filed> -->
       <Filed :span="24" :name="l('productUrl')">
-        <a href="#" @click="seeImg(entity.productUrl)">{{entity.productUrl}}</a>
+        <a href="#" @click="seeImg(entity.productUrl)">查看图片</a>
+      </Filed>
+      <Filed :span="24" :name="l('productUrlList')">
+        <files
+          ref="refFile"
+          :parms="parms"
+          fileFormat
+          :Photos="true"
+          :showList="false"
+          @clickItem="clickData"
+        />
       </Filed>
-      <Filed :span="24" :name="l('productUrlList')">{{entity.productUrlList}}</Filed>
     </Row>
   </div>
 </template>
@@ -26,6 +35,12 @@ export default {
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
         code: [{ required: true, message: "必填", trigger: "blur" }]
+      },
+      parms: {
+        app: "technology",
+        eid: "",
+        name: "",
+        field: ""
       }
     };
   },
@@ -38,12 +53,20 @@ export default {
     }
   },
   methods: {
+    clickData(data) {
+      window.open(data, "_blank");
+    },
     seeImg(url) {
+      if (url) {
         window.open(url, "_blank");
+      } else {
+        this.$Message.error("暂无图片");
+      }
     },
     load(v) {
       Api.get({ id: v }).then(r => {
         this.entity = r.result;
+        this.parms.eid = r.result.productUrlList;
         this.$emit("on-load");
       });
     },
@@ -64,3 +87,8 @@ export default {
   }
 };
 </script>
+<style lang="less" >
+.detail .upload-body {
+  border: none;
+}
+</style>
\ No newline at end of file

pages/technology/productMix/product/edit.vue

@@ -117,6 +117,7 @@ export default {
   methods: {
     clickData(data) {
       this.img = data;
+      this.entity.productUrl = data;
     },
     handleSelect1(data) {
       if (data.length > 0) {

pages/technology/productMix/product/index.vue

@@ -40,12 +40,12 @@
             <Col span="17" class="c">
               <div>产品分类：{{row.productClass}}</div>
               <div>图号：{{row.drawingNo}}</div>
-              <div>主制单位：{{row.madeCompany}}</div>
+              <div>主制单位：{{row.madeCompanyTitle}}</div>
               <p class="a-icon">
                 <a @click="edit(row.id)">
                   <Icon type="md-create" />编辑
                 </a>&nbsp;
-                <a @click="remove(row.id)">
+                <a @click="remove(row)">
                   <Icon type="ios-trash" />删除
                 </a>&nbsp;
                 <a @click="view(row.id)">
@@ -143,14 +143,23 @@ export default {
       this.detail = () => import("./edit");
       this.modal = true;
     },
-    remove(id) {
-      Api.delete(id).then(r => {
+    remove(row) {
+      this.$Modal.confirm({
+        title: "删除",
+        content: "<p>您确定要删除此产品吗？</p>",
+        onOk: () => {
+          Api.delete(row.id).then(r => {
             if (r.success) {
               this.$refs.grid.load();
               this.$Message.success("删除成功");
             }
           });
         },
+        onCancel: () => {
+          this.$Message.success("取消删除");
+        }
+      });
+    },
     cancel() {
       this.curId = 0;
       this.modal = false;

pages/technology/productMix/productTree/index.vue

 <template>
   <div class="flex fd tree-menu">
     <h3>
-      产品列表
+      产品分类
       <div class="fr mr10 mt10">
         <ButtonGroup class="fr" size="small">
           <Button icon="md-add" title="新增顶级" @click="addNew"></Button>
@@ -227,7 +227,7 @@ export default {
   }
   .fg {
     flex: none;
-    // height:0;
+    height: 100%;
     overflow: auto;
     padding-left: 10px;
   }