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

components/page/files.vue

@@ -20,6 +20,7 @@
         <p>将文件拖到此处，或点击上传</p>
       </div>
       <Button icon="ios-cloud-upload-outline" v-if="!cloudIco">上传文件</Button>
+      <span style="font-size:10px;color:#aaa" v-if="fileFormat">文件格式：{{JSON.stringify(formatList).replace('[', '').replace(']', '').replace(/\"/g, '')}}；文件最大：{{maxSize}}k</span>
     </Upload>
     <Progress :percent="per" :stroke-width="5" v-show="vshowPro" />
     <Tag
@@ -47,7 +48,7 @@ export default {
       fileUrlPath: "",
       nameList: [],
       hbaseFileListNew: [],
-      formatList: ["png", "jpg", "gif"],
+      formatList: ["jpg","gif","png"],
       multiple: true,
       postUrl: "",
       style: "",
@@ -81,6 +82,10 @@ export default {
     cloudIco: {
       type: Boolean,
       default: false
+    },
+    fileFormat:{
+      type: Boolean,
+      default: false
     }
   },
   methods: {
@@ -155,15 +160,15 @@ export default {
     formatL() {
       if (this.files) {
         this.formatList = [
+          "jpg",
+          "gif",
+          "png",
           "pdf",
           "docx",
           "doc",
           "xls",
           "xlsx",
           "txt",
-          "png",
-          "jpg",
-          "gif"
         ];
       }
       return this.formatList;

pages/order/quotation/index.vue

 <template>
   <Layout class="quotation">
     <!-- 左侧树 -->
-    <Sider hide-trigger :style="{background: '#fff'}" width="260">
+    <!-- <Sider hide-trigger :style="{background: '#fff'}" width="260">
       <Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
-    </Sider>
-    <!-- <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
+    </Sider> -->
+    <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
       <ProductTree @on-hide="onHide" @on-select="productSearch" />
     </Sider>
     <div v-if="!showMenu" class="show_menu">
       <a class="menu_play fr" @click="showMenuFn" title="展开">
         <Icon type="ios-arrow-forward" size="24" />
       </a>
-    </div> -->
+    </div>
     <!-- 右侧内容 -->
     <Content class="content" :class="!showMenu?'con_bord':''">
       <Tabs v-model="selectName" @on-click="handleClick">
@@ -397,13 +397,16 @@ export default {
       this.showMenu = true;
     },
     productSearch(id, item, ids) {
-      let where = { productId: { op: "In", value: ids } };
-      this.$refs.grid.reload(where);
+      // console.log(item)
+      this.getMsgFormSon(ids)
+      // let where = { productId: { op: "In", value: ids } };
+      // this.$refs.grid.reload(where);
     },
     update() {
       this.tableTata(this.selectName);
     },
     getMsgFormSon(data) {
+      // console.log(data)
       this.productId = data.join(",");
       this.tableTata(this.selectName);
     },

pages/processManage/setProcess/index.vue

 <template>
-  <div>
+<Layout class="lay100">
+  <!-- <div> -->
     <!-- 左侧树 -->
-    <div class="zh-tree" :style="{height:treeHeight+'px'}">
+    <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
+    <!-- <div class="zh-tree" :style="{height:treeHeight+'px'}"> -->
       <h3 class="zh-title">产品结构</h3>
       <div class="zh-box">
         <Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
@@ -13,9 +15,18 @@
           @on-select-change="selectTreeNode"
         ></Tree>
       </div>
+    </Sider>
+    <!-- </div> -->
+    <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
+      <ProductTree @on-hide="onHide" @on-select="productSearch" />
+    </Sider>
+    <div v-if="!showMenu" class="show_menu">
+      <a class="menu_play fr" @click="showMenuFn" title="展开">
+        <Icon type="ios-arrow-forward" size="24" />
+      </a>
     </div>
     <!-- 右侧内容 -->
-    <div class="content-right">
+    <Content class="con" :class="!showMenu?'con_bord':''">
       <div class="title_box">
         <div class="table_title">
           <div style="width:100px; float:left">
@@ -235,7 +246,7 @@
           @on-page-size-change="pageSizeChange"
         />
       </div>
-    </div>
+    </Content>
     <Modal
       v-model="modal1"
       :title="gymodaltitle"
@@ -339,19 +350,18 @@
     >
       <processview ref="processview"></processview>
     </Modal>
-  </div>
+  </Layout>
 </template>
 
 <script>
 import DrawerSet from "./components/drawerSet.vue"; //抽屉列表
-import TreeType from "./components/treeType.vue"; //左侧树列表
 
 import orderMaterial from "./components/orderMaterial.vue"; //料单
 
 import processMain from "./processMain.vue";
 import processNew from "../Process/processNew.vue";
 import service from "@/plugins/request";
-
+import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
 import OrderSendReview from "./components/orderSendReview"; //送审页面
 import processview from "../Process/processview.vue";
 import sendAudit from "../Process/sendAudit.vue";
@@ -359,7 +369,7 @@ import QS from "querystring";
 export default {
   components: {
     DrawerSet,
-    TreeType,
+    ProductTree,
     processMain,
     processNew,
     orderMaterial,
@@ -369,6 +379,7 @@ export default {
   },
   data() {
     return {
+      showMenu: true,
       isview: false,
       isdview: false,
       ismview: false,
@@ -698,7 +709,7 @@ export default {
     };
   },
   computed: {
-    searchList() {
+    searchList() {//产品树左侧
       let nodeList = this.treeData;
       var text = this.treeInputSearch;
       var newNodeList = [];
@@ -720,6 +731,21 @@ export default {
     }
   },
   methods: {
+    onHide() {
+      this.showMenu = false;
+    },
+    showMenuFn() {
+      this.showMenu = true;
+    },
+    productSearch(id, item, ids) {
+      console.log(id)
+      console.log(item)
+      console.log(ids)
+      // this.productId = data.join(",");
+      // this.tableTata(this.selectName);
+      // let where = { productId: { op: "In", value: ids } };
+      // this.$refs.grid.reload(where);
+    },
     // tab切换
     tabChange(name) {
       this.tabstatus = name;
@@ -862,6 +888,7 @@ console.log(this.orderSearchForm.SkipCount);
       });
     },
     selectTreeNode(value) {
+      console.log(value)
       if (value.length > 0) {
         this.ids = [];
         this.getAllIds(value);

pages/technology/add.vue

@@ -17,10 +17,10 @@
         </FormItem>
       </Col>
       <Col :span="8">
-        <FormItem v-if="title=='新增'" :label="l('code')" prop="code">
+        <!-- <FormItem v-if="title=='新增'" :label="l('code')" prop="code">
           <Input v-model="entity.code"></Input>
-        </FormItem>
-        <FormItem v-else-if="title=='克隆'" :label="l('code')" prop="code">
+        </FormItem>  v-else-if="title=='克隆'"-->
+        <FormItem :label="l('code')" prop="code">
           <Input disabled v-model="entity.code"></Input>
         </FormItem>
       </Col>
@@ -132,7 +132,7 @@
 
       <Col :span="24">
         <FormItem label="多媒体附件" prop="files">
-          <files ref="refFile" :parms="parms" files />
+          <files ref="refFile" :parms="parms" fileFormat/>
         </FormItem>
       </Col>
     </Row>
@@ -201,10 +201,10 @@ export default {
   mounted() {
     this.parms.eid = this.$u.guid();
     this.$refs.refFile.intFiles();
-    // console.log(this.title)
-    // console.log(this.eid)
     if (this.eid > 0) {
       this.load(this.eid);
+    }else{
+      this.getCodNumber();
     }
   },
   methods: {
@@ -290,16 +290,16 @@ export default {
         this.entity.isEffect = parseInt(r.result.isEffect);
         this.entity.id = 0;
       });
-      if(this.title=='克隆'){
+      this.getCodNumber();
+    },
+    getCodNumber(){
         Api.getCodeNumber({code:'GY',count:'1'}).then( r => {
-          // console.log(r)
           if(r.success){
             this.entity.code = r.result[0]
           }else{
             this.$Message.error("生成编号失败");
           }
         })
-      }
     },
     l(key) {
       key = "routingHeader" + "." + key;

pages/technology/edit.vue

@@ -129,7 +129,7 @@
 
       <Col :span="24">
         <FormItem label="多媒体附件" prop="files">
-          <files ref="refFile" :parms="parms" files />
+          <files ref="refFile" :parms="parms" fileFormat/>
         </FormItem>
       </Col>
     </Row>