Merge branch 'master' of http://222.71.165.188:3000/yunxi/jigangSCM2

jnpf-java-boot/jnpf-web/src/views/scm/businessline1/index.vue

@@ -28,7 +28,7 @@
       <!-- 父级 -->
       <FatherVue :upfuid="treeActiveId" />
     </div>
-    <div class="JNPF-common-layout-center" v-else-if="diffFlag=='5'">
+    <div class="JNPF-common-layout-center" v-if="diffFlag=='5'">
       <!-- 子级 -->
       <SonVue :upfuids="treeActiveId" />
     </div>
@@ -104,6 +104,7 @@ export default {
       query: {
         code: undefined,
         type: undefined,
+        parentId: undefined,
       },
       treeProps: {
         children: 'children',
@@ -356,18 +357,19 @@ export default {
     },
     handleNodeClick(data, node) {
       this.treeActiveId = data.id
+      this.diffFlag = ''
       this.diffFlag = data.diffFlag
-      for (let key in this.query) {
+      // for (let key in this.query) {
-        this.query[key] = undefined
+      //   this.query[key] = undefined
-      }
+      // }
-      this.query.parentId = data.id
+      // this.query.parentId = data.id
-      this.listQuery = {
+      // this.listQuery = {
-        currentPage: 1,
+      //   currentPage: 1,
-        pageSize: 20,
+      //   pageSize: 20,
-        sort: "desc",
+      //   sort: "desc",
-        sidx: "",
+      //   sidx: "",
-      }
+      // }
-      this.initData()
+      // this.initData()
     },
     async initSearchDataAndListData() {
       await this.initSearchData()

jnpf-java-boot/jnpf-web/src/views/scm/businessline2/index.vue

@@ -63,6 +63,7 @@
             </el-tooltip>
           </div>
         </div>
+
         <JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
           @selection-change="handleSelectionChange" :span-method="arraySpanMethod">
           <!-- <el-table-column prop="code" label="业务线编号" align="left">
@@ -158,7 +159,7 @@ export default {
   props: {
     upfuid: { // 接收父组件传递过来的 treeActiveId
       type: String,
-      default: ''
+      default: '',
     }
   },
   data() {
@@ -227,9 +228,12 @@ export default {
       return this.$route.meta.modelId || ''
     }
   },
+  watch: {
+    upfuid: function (val) {
+      this.initData()
+    }
+  },
   created() {
-    console.log(this.upfuid, '------------');
-
     getFormById("521634040684484613").then(res1 => {
       let flowId = res1.data && res1.data.id
       getFlowList(flowId, '1').then(res2 => {
@@ -442,7 +446,7 @@ export default {
 
         var _list = res.data.list;
 
-        console.log(_list);
+        console.log(_list, '工厂');
         this.list = _list.map(o => ({
           ...o,
           ...this.expandObj,

jnpf-java-boot/jnpf-web/src/views/scm/businessline3/index.vue

@@ -225,6 +225,11 @@ export default {
       return this.$route.meta.modelId || ''
     }
   },
+  watch: {
+    upfuids: function (val) {
+      this.initData()
+    }
+  },
   created() {
     getFormById("521949393889270917").then(res1 => {
       let flowId = res1.data && res1.data.id

jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue

@@ -170,6 +170,7 @@
 
           <el-table-column prop="creatorTime" label="创建时间" align="left">
           </el-table-column>
+
           <el-table-column prop="realName" label="创建人" align="left">
           </el-table-column>
           <el-table-column prop="lastModifyTime" label="更新时间" align="left">
@@ -259,7 +260,6 @@ export default {
   data() {
 
     return {
-
       keyword: '',
       expandsTree: true,
       refreshTree: true,
@@ -358,11 +358,13 @@ export default {
     }
   },
   computed: {
+
     ...mapGetters(['userInfo']),
     menuId() {
       return this.$route.meta.modelId || ''
     }
   },
+
   created() {
     getFormById("1760188153336909825").then(res1 => {
       let flowId = res1.data && res1.data.id