Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/Creditbilladj/modules/details.vue

@@ -34,7 +34,7 @@
     <div slot="slot0" >
       <enterpriseTable ref="enterprise">
         <template v-slot:edit="scope">
-            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'enterpriseInfoManage') && mainData.status == '新建'" type="text" size="mini" @click="$refs.enterprise.currentEdit=scope.data,$refs.enterprise.accountSelect(scope.data)">编 辑</el-button>
+            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'enterpriseInfoManage') && mainData.status == '新建'" type="text" size="mini" @click="$refs.enterprise.currentEdit=scope.data">编 辑</el-button>
         </template>
         <template v-slot:del="scope">
           <delete-btn v-if="tool.checkAuth($route.name,'enterpriseInfoManage') && mainData.status == '新建'" nameId="20230104101003" nameKey="sa_creditbilldetailids" :id="scope.data.sa_creditbilldetailid" message="确定删除当前数据吗?" @deleteSuccess="$refs.enterprise.listData()"></delete-btn>

src/HDrpManagement/Creditbilladj/modules/enterpriseTable/index.vue

@@ -8,18 +8,18 @@
       <tableLayout :layout="tablecols" :data="list" :opwidth="200" :width="false" height="calc(100vh - 550px)" :custom="true" fixedName="operation" >
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname == 'accountname'">
-            <el-select v-if="currentEdit.sa_creditbilldetailid == scope.column.data.sa_creditbilldetailid && accountList.length > 0" size="small" v-model="scope.column.data.sa_accountclassid" placeholder="请选择账户类型">
+            <!-- <el-select v-if="currentEdit.sa_creditbilldetailid == scope.column.data.sa_creditbilldetailid && accountList.length > 0" size="small" v-model="scope.column.data.sa_accountclassid" placeholder="请选择账户类型">
               <el-option
                 v-for="item in accountList"
                 :key="item.sa_accountclassid"
                 :label="item.accountname"
                 :value="item.sa_accountclassid">
               </el-option>
-            </el-select>
-            <span v-else>{{scope.column.data.accountname}}</span>
+            </el-select> -->
+            <span>{{scope.column.data.accountname}}</span>
           </div>
           <div v-else-if="scope.column.columnname == 'creditquota'">
-            <el-input size="mini" v-if="currentEdit.sa_creditbilldetailid == scope.column.data.sa_creditbilldetailid" v-model.number="scope.column.data.creditquota"></el-input>
+            <el-input size="mini" v-if="currentEdit.sa_creditbilldetailid == scope.column.data.sa_creditbilldetailid" v-model="scope.column.data.creditquota"></el-input>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </div>
           <div v-else-if="scope.column.columnname == 'remarks'">
@@ -100,13 +100,13 @@ export default {
       console.log(this.list);
       
     },
-    accountSelect (data) {
-      console.log(data);
+    // accountSelect (data) {
+    //   console.log(data);
       
-      data.sa_accountclassid = ''
-      this.accountParam.content.sys_enterpriseid=data.sys_enterpriseid
-      this.getAccountList(data)
-    },
+    //   data.sa_accountclassid = ''
+    //   this.accountParam.content.sys_enterpriseid=data.sys_enterpriseid
+    //   this.getAccountList(data)
+    // },
     async getAccountList (data) {
       this.accountParam.content.sa_creditbillid = data.sa_creditbillid
       let res = await this.$api.requested(this.accountParam)
@@ -117,13 +117,13 @@ export default {
     handleChange(num) {
     },
     async save (data) {
-      if (!data.sa_accountclassid) return this.$message({
-        type:'warning',
-        message:'请选择账户类型'
-      })
-      console.log(typeof data.creditquota);
+      // if (!data.sa_accountclassid) return this.$message({
+      //   type:'warning',
+      //   message:'请选择账户类型'
+      // })
+      // console.log(typeof data.creditquota);
       
-      if (typeof data.creditquota != 'number') return this.$message({
+      if (typeof +data.creditquota != 'number') return this.$message({
         type:'warning',
         message:'信用额度是数字类型'
       })

src/SDrpManagement/ProductGroup/index.vue

@@ -61,6 +61,7 @@
 <script>
 import selectClass from './modules/Select.vue'
 import selectPeople from './modules/selectPeople'
+import { log } from '@antv/g2plot/lib/utils';
 export default {
   name: 'productgroup',
   data() {
@@ -118,6 +119,8 @@ export default {
         this.params.content.where.itemclassid = ''
         this.$refs.class.class_act = ''
         this.$refs.class.activeClass = {}
+        this.params.content.pageNumber = 1
+        
         this.getProductGroup()
       })