Merge branch 'master' of http://192.168.1.8:3000/baishaojie/crm_pc

src/components/Pagination/index1.vue

@@ -18,7 +18,7 @@
 import { scrollTo } from '@/utils/scroll-to'
 
 export default {
-  name: 'Pagination',
+  name: 'Pagination1',
   props: {
     total: {
       required: true,

src/components/Pagination1/index.vue

@@ -0,0 +1,101 @@
+<template>
+  <div :class="{'hidden':hidden}" class="pagination-container">
+    <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="pageSize"
+      :layout="layout"
+      :page-sizes="pageSizes"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+
+<script>
+import { scrollTo } from '@/utils/scroll-to'
+
+export default {
+  name: 'Pagination',
+  props: {
+    total: {
+      required: true,
+      type: Number
+    },
+    page: {
+      type: Number,
+      default: 1
+    },
+    limit: {
+      type: Number,
+      default: 10
+    },
+    pageSizes: {
+      type: Array,
+      default() {
+        return [10, 20, 30, 50, 100]
+      }
+    },
+    layout: {
+      type: String,
+      default: 'total, sizes, prev, pager, next, jumper'
+    },
+    background: {
+      type: Boolean,
+      default: true
+    },
+    autoScroll: {
+      type: Boolean,
+      default: true
+    },
+    hidden: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    currentPage: {
+      get() {
+        return this.page
+      },
+      set(val) {
+        this.$emit('update:page', val)
+      }
+    },
+    pageSize: {
+      get() {
+        return this.limit
+      },
+      set(val) {
+        this.$emit('update:limit', val)
+      }
+    }
+  },
+  methods: {
+    handleSizeChange(val) {
+      this.$emit('pagination', { page: this.currentPage, limit: val })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    },
+    handleCurrentChange(val) {
+      this.$emit('pagination', { page: val, limit: this.pageSize })
+      if (this.autoScroll) {
+        scrollTo(0, 800)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.pagination-container {
+  background: #fff;
+  padding: 16px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
+</style>

src/views/basicData/productList/index.vue

@@ -655,7 +655,8 @@ export default {
         cname: row.cname,
         remark: row.remark,
         sort: row.sort,
-        enable: row.enable
+        enable: row.enable,
+        pImage:row.pImage,
       }
 
 

src/views/productManagement/processConfiguration/index.vue

@@ -191,7 +191,7 @@
                 :default-props="defaultProps"
                 :node-key="nodeKey"
                 :checked-keys="defaultCheckedKeys"
-                @popoverHide="popoverHide"
+                @popoverHide="popoverHideEdit"
                 :disabled="false"
               />
             </el-form-item>
@@ -512,7 +512,7 @@ export default {
     handleProcessRecordsCancelAdd(){
         this.dialogProcessRecords = false;
         this.dialogTitle = '';
-        this.processRecordsParammapsParm = {};
+        this.processRecordsParammapsParm = {process: '',  sort: '',remark: ''};
         this.dialogProcessRecordsEdit = false;
     },
     handleProcessRecordsEdit(row){
@@ -581,6 +581,14 @@ export default {
           this.addControlsParm.parammaps.pid ='';
         }
       },
+
+    popoverHideEdit(checkedIds,checkedData) {
+      if (checkedIds !== null) {
+        this.editControlsParm.parammaps.pid = checkedData.id
+      } else {
+        this.editControlsParm.parammaps.pid ='';
+      }
+    },
     handleCancelAdd(){
         this.dialogControlsAdd = false;
         this.dialogTitle = '';
@@ -589,6 +597,8 @@ export default {
     },
     handleControlsAdd(){
         this.dialogControlsAdd = true;
+        this.defaultCheckedKeys = []
+        this.addControlsParm = {name:'addProcess',parammaps:{}};
         this.dialogTitle = '添加生产名称'
     },
     handleControlsAddData(){
@@ -619,6 +629,7 @@ export default {
         this.dialogTitle = '';
     },
     handleNodeClick(data,node){
+      this.list = [];
         if (node.isLeaf) {
             this.pid = data.id;
             this.get_process_records()