Merge branch 'xiaoqin' into mergeBranch

src/Form/Creditbilladj/add.vue

@@ -1,122 +1,50 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible">
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="sys_enterpriseid">
-              <el-select v-model="form.sys_enterpriseid" placeholder="请选择企业" @change="enterpriseChange">
-                <el-option
-                  v-for="item in enterpriseData"
-                  :key="item.sys_enterpriseid"
-                  :label="item.enterprisename"
-                  :value="item.sys_enterpriseid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账户类型" prop="sa_accountclassid">
-              <el-select v-model="form.sa_accountclassid" placeholder="请选择账户类型">
-                <el-option
-                  v-for="item in accountClassData"
-                  :key="item.sa_accountclassid"
-                  :label="item.accountname"
-                  :value="item.sa_accountclassid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="信用额度" prop="creditquota">
-              <el-input v-model="form.creditquota" placeholder="输入信用额度"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="备注" prop="address">
-              <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
+    <el-dialog title="新建调整单" width="30%" append-to-body :visible.sync="dialogFormVisible">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remarks">
+                <el-input v-model="form.remarks" type="textarea" placeholder="输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
       <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
-      </div>
+          <el-button size="small" @click="dialogFormVisible=false" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+        </div>
     </el-dialog>
-   
-    
   </div>
 </template>
-
 <script>
-import DownSelect from '@/components/down_select/index'
 export default {
-  components:{DownSelect},
+  components:{},
   data () {
     return {
       dialogFormVisible:false,
-      enterpriseData:[],
-      accountClassData:[],
       form:{
         sa_creditbillid:0,
-        sys_enterpriseid:'',
-        sa_accountclassid:'',
-        creditquota:'',
         remarks:''
       },
-      arealist:[],
       rules:{
-        sys_enterpriseid: [
-          { required: true, message: '请选择企业名称', trigger: 'blur' },
-        ],
-        sa_accountclassid: [
-          { required: true, message: '请选择账户类型', trigger: 'blur' },
-        ],
-        creditquota: [
-          { required: true, message: '请填写信用额度', trigger: 'change' },
-        ],
-      }
-    }
-  },
-  methods:{
-    /* 获取企业档案 */
-    async getEnterpriseData() {
-      let res = await this.$api.requested({
+      },
+      params: {
         "id": "20221008164103",
         "version":1,
         "content": {
+          "pageSize":20,
+          "pageNumber":1,
           "where":{
               "condition":""
           }
         }
-      })
-      this.enterpriseData = res.data
-      console.log(this.enterpriseData);
-      
-    },
-    /* 企业选择变化 */
-    async enterpriseChange() {
-      console.log(this.form.sys_enterpriseid);
-      let res = await this.$api.requested({
-        "id": "20221008164203",
-        "version":1,
-        "content": {
-          "sys_enterpriseid":this.form.sys_enterpriseid
-        }
-      })
-      this.form.sa_accountclassid = ''
-      this.accountClassData = res.data
-      console.log(this.accountClassData);
-      
-    },
-    cascaderChange (val) {
-      if (val.length === 1) 
-        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
-
-      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
-    },
+      },
+    }
+  },
+  components:{},
+  methods:{
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
@@ -124,17 +52,19 @@ export default {
         "id": "20221008155003",
         "version":1,
         "content": this.form
-      })
+        })
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
+          this.$router.push({path:'/creditbilladjDetail',query:{id:res.data.sa_creditbillid,rowindex:res.data.rowindex}})
+          this.$store.dispatch('changeDetailDrawer',true)
         })
-     })
-    }
+      })
+      
+    },
   },
   created() {
-    this.getEnterpriseData()
   },
   mounted () {
   }

src/Form/Creditbilladj/edit.vue

@@ -1,118 +1,54 @@
 <template>
   <div>
-    <el-button size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-dialog title="编 辑" append-to-body :visible.sync="dialogFormVisible">
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="sys_enterpriseid">
-              <el-select v-model="form.sys_enterpriseid" placeholder="请选择企业" @change="enterpriseChange">
-                <el-option
-                  v-for="item in enterpriseData"
-                  :key="item.sys_enterpriseid"
-                  :label="item.enterprisename"
-                  :value="item.sys_enterpriseid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="账户类型" prop="sa_accountclassid">
-              <el-select v-model="form.sa_accountclassid" placeholder="请选择账户类型">
-                <el-option
-                  v-for="item in accountClassData"
-                  :key="item.sa_accountclassid"
-                  :label="item.accountname"
-                  :value="item.sa_accountclassid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="信用额度" prop="creditquota">
-              <el-input v-model="form.creditquota" placeholder="输入信用额度"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="备注" prop="address">
-              <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入备注"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
+    <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
+    <el-dialog title="编辑调整单" width="30%" append-to-body :visible.sync="dialogFormVisible">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remarks">
+                <el-input v-model="form.remarks" type="textarea" placeholder="输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
       <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
-      </div>
+          <el-button size="small" @click="dialogFormVisible=false" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+        </div>
     </el-dialog>
   </div>
 </template>
-
 <script>
-import {mapGetters} from 'vuex'
 export default {
-  props:['data','btnType'],
+  components:{},
+  props:['data'],
   data () {
     return {
       dialogFormVisible:false,
-      enterpriseData:[],
-      accountClassData:[],
       form:{
         sa_creditbillid:0,
-        sys_enterpriseid:'',
-        sa_accountclassid:'',
-        creditquota:'',
         remarks:''
       },
       rules:{
-        sys_enterpriseid: [
-          { required: true, message: '请选择企业名称', trigger: 'blur' },
-        ],
-        sa_accountclassid: [
-          { required: true, message: '请选择账户类型', trigger: 'blur' },
-        ],
-        creditquota: [
-          { required: true, message: '请填写信用额度', trigger: 'change' },
-        ],
-      }
-    }
-  },
-  methods:{
-    /* 获取企业档案 */
-    async getEnterpriseData() {
-      let res = await this.$api.requested({
+      },
+      params: {
         "id": "20221008164103",
         "version":1,
         "content": {
+          "pageSize":20,
+          "pageNumber":1,
           "where":{
               "condition":""
           }
         }
-      })
-      this.enterpriseData = res.data
-      console.log(this.enterpriseData);
-      
-    },
-    /* 企业选择变化 */
-    async enterpriseChange() {
-      console.log(this.form.sys_enterpriseid);
-      let res = await this.$api.requested({
-        "id": "20221008164203",
-        "version":1,
-        "content": {
-          "sys_enterpriseid":this.form.sys_enterpriseid
-        }
-      })
-      this.form.sa_accountclassid = ''
-      this.accountClassData = res.data
-      console.log(this.accountClassData);
-      
-    },
-    cascaderChange (val) {
-      if (val.length === 1) 
-        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
-
-      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+      },
+    }
+  },
+  components:{},
+  methods:{
+    editBtn () {
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
@@ -121,33 +57,17 @@ export default {
         "id": "20221008155003",
         "version":1,
         "content": this.form
-      })
+        })
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
         })
-     })
-    },
-    async onShow () {
-      this.form = Object.assign({},this.form,this.data)
-      console.log(this.form);
+      })
       
-      if( this.data ) {
-        let res = await this.$api.requested({
-          "id": "20221008164203",
-          "version":1,
-          "content": {
-            "sys_enterpriseid":this.form.sys_enterpriseid
-          }
-        })
-        this.accountClassData = res.data
-      }
-      this.dialogFormVisible = true
-    }
+    },
   },
   created() {
-    this.getEnterpriseData()
   },
   mounted () {
   }
@@ -156,6 +76,6 @@ export default {
 </script>
 <style scoped>
 /deep/.el-select {
-  width: 100% !important;
+  width: 100%!important;
 }
 </style>

src/Form/payvoucher/add.vue

@@ -4,7 +4,7 @@
     <el-drawer
         title="创建支出凭证"
         :visible.sync="dialogFormVisible"
-        size="25%"
+        size="40%"
         direction="rtl"
         append-to-body
         @close="onClose">

src/Form/payvoucher/edit.vue

@@ -4,7 +4,7 @@
     <el-drawer
         title="编辑支出凭证"
         :visible.sync="dialogFormVisible"
-        size="25%"
+        size="40%"
         direction="rtl"
         append-to-body
         @close="dialogFormVisible = false">

src/HDrpManagement/Creditbilladj/modules/details.vue

@@ -2,55 +2,71 @@
 <template>
   <basicDetails 
     ref="details"
-    :titleText="mainData.enterprisename"
-    formPath="Creditbilladj"
+    :titleText="mainData.billno"
     :editData="mainData"
     :mainAreaData="mainAreaData" 
     :turnPageId="20221008155103" 
     idname="sa_creditbillid"
     :tags="[]"
+    :tabs="['企业信息','详细信息']"
     @pageChange="pageChange"
     delApiId="20221008155403"
+    :statusCheck="[{key:'status',value:'审核'}]"
     @onEditSuccess="queryMainData($route.query.id)">
     <div slot="tags">
       <!-- 使用此插槽可不传[tags] -->
       <!-- :tabs="['经销商团队','代理区域','营销类别','账户余额']" -->
     </div>
     <div slot="customOperation">
-      <el-button class="inline-16" size="mini" @click="checkBuill(mainData)" v-if="mainData.status == '新建'">审 核</el-button>
+      <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData"/>
+      <customBtn
+          class="inline-16"
+          btnName="审 核"
+          message="确定审核当前信用单吗?"
+          idName="20221008155303"
+          keyName="sa_creditbillid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData()" 
+          v-if="mainData.status == '新建' && tool.checkAuth($route.name,'check')"
+        />
       <!-- 此区域提供了自定义操作按钮 -->
     </div>
-    <!-- <div slot="slot0" class="container normal-panel">
-      <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
-      <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="300px"></tableLayout>
+    <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>
+        </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>
+        </template>
+        <Add slot="add" v-if="tool.checkAuth($route.name,'enterpriseInfoManage') && mainData.status == '新建'" @onSuccess="$refs.enterprise.listData()"></Add>
+      </enterpriseTable>
     </div>
-    <div slot="slot1" class="container normal-panel">
-      <salescope :data="mainData"></salescope>
+    <div slot="slot1">
+      <base-info v-if="detailInfo" :detailInfo="detailInfo"></base-info>
     </div>
-    <div slot="slot2" class="container normal-panel">
-      <SaleClass :data="mainData"></SaleClass>
-    </div>
-    <div slot="slot3" class="container normal-panel">
-      <accountMoney :mainData="mainData"></accountMoney>
-    </div> -->
   </basicDetails>
 </template>
 
 <script>
-// import salescope from './modules/salescope/list'
-// import SaleClass from './modules/saleclass/index'
-// import accountMoney from './modules/accountMoney/index'
+import BaseInfo from '@/HDrpManagement/projectChange/modules/modules/baseInfo/baseInfo'
+import enterpriseTable from './enterpriseTable/index'
+import Add from './enterpriseTable/add'
+
+import Edit from '@/Form/Creditbilladj/edit'
 export default {
   data () {
     return {
       mainData:{},
       mainAreaData:[],
+      detailInfo:''
     }
   },
   components:{
-    // salescope,
-    // SaleClass,
-    // accountMoney
+    enterpriseTable,
+    Add,
+    Edit,
+    BaseInfo
   },
   methods:{
     async queryMainData (id) {
@@ -90,20 +106,8 @@ export default {
           value: this.mainData.billno
         },
         {
-          label:'客户名称',
-          value: this.mainData.enterprisename
-        },
-        {
-          label:'账户编号',
-          value: this.mainData.accountno
-        },
-        {
-          label:'账户类型',
-          value: this.mainData.accountname
-        },
-        {
-          label:'信用额度',
-          value: this.mainData.creditquota
+          label:'单据日期',
+          value: this.mainData.createdate
         },
         {
           label:'状态',
@@ -113,36 +117,33 @@ export default {
           label:'备注',
           value: this.mainData.remarks
         },
-        {
-          label:'状态',
-          value: this.mainData.status
-        },
-        {
-          label:'创建人',
-          value: this.mainData.createby
-        },
-        {
-          label:'创建时间',
-          value: this.mainData.createdate
-        },
-        {
-          label:'最近修改人',
-          value: this.mainData.changeby
-        },
-        {
-          label:'修改时间',
-          value: this.mainData.changedate 
-        },
-        {
-          label:'审核人',
-          value: this.mainData.checkby
-        },
-        {
-          label:'审核时间',
-          value: this.mainData.checkdate
-        },
-        
       ]
+      this.detailInfo = {
+        baseInfo: [
+          {
+            label:'额度单号',
+            value: this.mainData.billno
+          },
+          {
+            label:'单据日期',
+            value: this.mainData.createdate
+          },
+          {
+            label:'状态',
+            value: this.mainData.status
+          },
+          {
+            label:'备注',
+            value: this.mainData.remarks
+          },
+        ],
+        systemInfo: [
+          {label:'创建人',value:this.mainData.createby},
+          {label:'创建时间',value:this.mainData.createdate},
+          {label:'审核人',value:this.mainData.checkby},
+          {label:'审核时间',value:this.mainData.checkdate},
+        ]
+      }
     }
   },
   mounted () {

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

@@ -0,0 +1,212 @@
+<template>
+  <div>
+    <el-button size="mini" type="primary" @click="dialogFormVisible = true">添 加</el-button>
+    <el-drawer title="新建调整单" size="70%" append-to-body :show-close="false" :visible.sync="dialogFormVisible">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="企业" prop="remarks">
+                <selectEnterpise v-if="dialogFormVisible" @selectChange="selectChange" idName="sys_enterpriseid" ref="table" v-model="result" :layout="tablecols" :data="list" :custom="true" height="500px"  @upDateData="upDateData">
+                  <template v-slot:customcol="scope">
+                    <div v-if="scope.column.columnname == 'province'">
+                      {{scope.column.data.province}}-{{scope.column.data.city}}-{{scope.column.data.county}}
+                    </div>
+                    <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
+                  </template>
+                </selectEnterpise>
+                <div class="container normal-panel" style="text-align:right">
+                  <el-pagination
+                      style="text-align:right"
+                      background
+                      small
+                      @size-change="handleSizeChange"
+                      @current-change="handleCurrentChange"
+                      :current-page="params.content.pageNumber"
+                      :page-size="params.content.pageSize"
+                      layout="total, prev, pager, next, jumper"
+                      :total="total">
+                  </el-pagination>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible=false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="dialogFormVisible2 = true" class="normal-btn-width">下 一 步</el-button>
+      </div>
+    </el-drawer>
+    <el-drawer title="信息配置" size="60%" append-to-body :show-close="false" :visible.sync="dialogFormVisible2">
+      <div class="drawer__panel">
+        <el-table
+          :data="selectArr"
+          size="small"
+          stripe
+          style="width: 100%"
+          height="300"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            label="企业名称"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="sa_accountclassid"
+            label="账户类型"
+            width="250">
+            <template slot-scope="scope">
+              <el-select size="small" @focus="accountSelect(scope.row)" v-model="scope.row.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>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="creditquota"
+            label="信用额度">
+            <template slot-scope="scope">
+              <el-input type="text" size="small" placeholder="额度" v-model.number="scope.row.creditquota"></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible2=false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">提 交</el-button>
+      </div>
+    </el-drawer>
+    
+  </div>
+</template>
+<script>
+import selectEnterpise from '@/components/selectTable/index'
+export default {
+  components:{},
+  data () {
+    return {
+      dialogFormVisible:false,
+      dialogFormVisible2:false,
+      accountList:[],
+      form:{
+    
+      },
+      rules:{
+      },
+      result:'',
+      tablecols:[],
+      list:[],
+      total:0,
+      params: {
+        "id": "20221008164103",
+        "version":1,
+        "content": {
+          "pageSize":20,
+          "pageNumber":1,
+          "where":{
+              "condition":""
+          }
+        }
+      },
+      accountParam: {
+        "id": "20221008164203",
+        "version":1,
+        "content": {
+          "sys_enterpriseid":'',
+          "sa_creditbillid":this.$route.query.id
+        }
+      },
+      selectArr:[]
+    }
+  },
+  components:{selectEnterpise},
+  methods:{
+    // /* 获取企业档案 */
+    async getEnterpriseData() {
+      let res = await this.$api.requested(this.params)
+      this.total = res.total
+      this.list = res.data
+      console.log(this.list);
+    },
+    async getAccountList () {
+      this.accountParam.content.sa_creditbillid = this.$route.query.id
+      let res = await this.$api.requested(this.accountParam)
+      this.accountList = res.data
+      console.log(this.accountList);
+      
+    },
+    async onSubmit () {
+      let is = this.selectArr.every(item => item.sa_accountclassid && item.creditquota)
+      if (is) {
+        let data = this.selectArr.map(item => {
+          return {
+            "sa_creditbilldetailid":0,
+              "sys_enterpriseid":item.sys_enterpriseid,
+              "sa_accountclassid":item.sa_accountclassid,
+              "creditquota":item.creditquota
+          }
+        })
+        const res = await this.$api.requested({
+        "id": "20230104100203",
+        "version":1,
+        "content": {
+          sa_creditbillid:this.$route.query.id,
+          enterpriseinfos: data
+        }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible2 = false
+          this.dialogFormVisible = false
+        })
+      } else {
+        this.$message({
+          type:'warning',
+          message:'请填写完整信息'
+        })
+      }
+      
+    },
+    accountSelect (data) {
+      console.log('触发');
+      
+      this.accountParam.content.sys_enterpriseid=data.sys_enterpriseid
+      this.getAccountList()
+    },
+    selectChange (data) {
+      this.selectArr = data
+    },
+    upDateData (data) {
+      this.selectArr = data
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.getEnterpriseData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.getEnterpriseData()
+    },
+  },
+  created() {
+    this.getEnterpriseData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).addEnterpriseTable.tablecols
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style scoped>
+/deep/.el-select {
+  width: 100%!important;
+}
+</style>

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

@@ -0,0 +1,158 @@
+<template>
+  <div>
+    <div>
+      <div class="flex-align-center" style="margin-bottom:10px">
+        <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
+        <slot name="add"/>
+      </div>
+      <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" 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>
+          </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>
+            <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+          </div>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <el-button v-if="currentEdit.sa_creditbilldetailid == scope.data.sa_creditbilldetailid || scope.data.sa_creditbilldetailid == 0" type="text" size="mini" @click="save(scope.data)" class="inline-16">保 存</el-button>
+          <slot name="edit" :data="scope.data" v-else></slot>
+          <slot name="del" :data="scope.data"></slot>
+        </template>
+      </tableLayout>
+    </div>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.content.pageNumber"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['disabled'],
+  components: {},
+  name: '',
+  data() {
+    return {
+      list:[],
+      params: {
+        "id": 20230104100903,
+        "content": {
+          "sa_creditbillid":'',
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+              "condition": ""
+          }
+        },
+      },
+      accountParam: {
+        "id": "20221008164203",
+        "version":1,
+        "content": {
+          "sys_enterpriseid":'',
+          "sa_creditbillid":this.$route.query.id
+        }
+      },
+      tablecols:[],
+      total:0,
+      currentEdit:{},
+      accountList:[]
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  created () {
+    this.listData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).enterpriseInfoTable.tablecols
+  },
+  methods: {
+    async listData(){
+      this.params.content.sa_creditbillid = this.$route.query.id
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(this.list);
+      
+    },
+    accountSelect (data) {
+      data.sa_accountclassid = ''
+      this.accountParam.content.sys_enterpriseid=data.sys_enterpriseid
+      this.getAccountList(data)
+    },
+    async getAccountList (data) {
+      this.accountParam.content.sa_creditbillid = this.$route.query.id
+      let res = await this.$api.requested(this.accountParam)
+      this.accountList = res.data
+      console.log(this.accountList);
+      
+    },
+    handleChange(num) {
+    },
+    async save (data) {
+      if (!data.sa_accountclassid) return this.$message({
+        type:'warning',
+        message:'请选择账户类型'
+      })
+      console.log(typeof data.creditquota);
+      
+      if (typeof data.creditquota != 'number') return this.$message({
+        type:'warning',
+        message:'信用额度是数字类型'
+      })
+      let res = await this.$api.requested({
+        "id": 20230104100203,
+        "content": {
+          "sa_creditbillid": this.$route.query.id,
+          "enterpriseinfos": [
+            {
+              "sa_creditbilldetailid":data.sa_creditbilldetailid,
+                "sys_enterpriseid":data.sys_enterpriseid,
+                "sa_accountclassid":data.sa_accountclassid,
+                "creditquota":data.creditquota
+            },
+          ]
+        },
+      })
+      this.tool.showMessage(res,() => {
+        this.currentEdit = ''
+        this.$emit('onSuccess')
+        this.listData()
+      })
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/payvoucher/details/index.vue

@@ -62,6 +62,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
     },
     changeDataStructure(){
@@ -98,6 +100,14 @@ export default {
           label:'单据日期',
           value:this.mainData.createdate
         },
+        {
+          label:'凭证来源',
+          value:this.mainData.sourse
+        },
+        {
+          label:'凭证来源说明',
+          value:this.mainData.sourcenote
+        },
         {
           label:'备注',
           value:this.mainData.remarks
@@ -119,6 +129,8 @@ export default {
     }
   },
   created() {
+    console.log('触发111');
+    
     this.queryMainData(this.$route.query.id)
   }
 }

src/HDrpManagement/recvoucher/details/index.vue

@@ -98,6 +98,14 @@ export default {
           label:'单据日期',
           value:this.mainData.createdate
         },
+        {
+          label:'凭证来源',
+          value:this.mainData.sourse
+        },
+        {
+          label:'凭证来源说明',
+          value:this.mainData.sourcenote
+        },
         {
           label:'备注',
           value:this.mainData.remarks