Преглед изворни кода

支出凭证、信用配置、特殊订单新建

qymljy пре 2 година
родитељ
комит
4808d55204

+ 5 - 0
.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

+ 12 - 0
.idea/chuchuManage.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

+ 8 - 0
.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/chuchuManage.iml" filepath="$PROJECT_DIR$/.idea/chuchuManage.iml" />
+    </modules>
+  </component>
+</project>

+ 6 - 0
.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

+ 37 - 3
src/Form/payvoucher/add.vue

@@ -18,7 +18,7 @@
             </el-col>
             <el-col :span="12" >
               <el-form-item label="账户类型:" prop="sa_accountclassid">
-                <el-select v-model="form.sa_accountclassid" placeholder="请选择账户类型" style="width: 100%">
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择账户类型" style="width: 100%" >
                   <el-option
                       v-for="item in accountclass"
                       :key="item.sa_accountclassid"
@@ -63,6 +63,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="账户余额:" prop="balance" v-if="form.sa_accountclassid">
+                <el-input v-model="form.balance" placeholder="账户余额"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="信用额度:" prop="creditquota" v-if="form.sa_accountclassid">
+                <el-input v-model="form.creditquota" placeholder="信用额度"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注:" >
                 <el-input v-model="form.remarks" type="textarea" rows="5" placeholder="请输入备注信息"></el-input>
@@ -108,7 +118,9 @@ export default {
         remarks:'',
         status:'新建',
         subclass:"",
-        class:""
+        class:"",
+        balance:"",
+        creditquota:""
       },
       rules:{
         enterprisename:[
@@ -211,6 +223,21 @@ export default {
         subclass:"",
         class:""
       }
+    },
+    /*查询账户余额和信用额度*/
+    async queryBalance(accountno){
+      const res = await this.$api.requested({
+        "accesstoken": "825a4e9348176c31a66b78289f8e8d26",
+        "id": 20221008145903,
+        "content": {
+          "where": {
+            "sys_enterpriseid": this.form.sys_enterpriseid,
+            "accountno": accountno
+          }
+        }
+      })
+      this.form.balance = res.data[0].balance
+      this.form.creditquota = res.data[0].creditquota
     }
   },
   created() {
@@ -220,6 +247,13 @@ export default {
     "form.sys_enterpriseid":function (val){
       console.log(val)
       this.accountList(val)
+    },
+    "form.sa_accountclassid":function (val){
+      this.accountclass.forEach(item=>{
+        if (item.sa_accountclassid === val){
+          this.queryBalance(item.accountno)
+        }
+      })
     }
   }
 
@@ -228,4 +262,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

+ 5 - 5
src/HDrpManagement/Creditbilladj/modules/details.vue

@@ -1,11 +1,11 @@
 
 <template>
-  <basicDetails 
+  <basicDetails
     ref="details"
     :titleText="mainData.billno"
     :editData="mainData"
-    :mainAreaData="mainAreaData" 
-    :turnPageId="20221008155103" 
+    :mainAreaData="mainAreaData"
+    :turnPageId="20221008155103"
     idname="sa_creditbillid"
     :tags="[]"
     :tabs="['经销商信息','详细信息']"
@@ -26,7 +26,7 @@
           idName="20221008155303"
           keyName="sa_creditbillid"
           :id="$route.query.id"
-          @onSuccess="queryMainData()" 
+          @onSuccess="queryMainData()"
           v-if="mainData.status == '新建' && tool.checkAuth($route.name,'check')"
         />
       <!-- 此区域提供了自定义操作按钮 -->
@@ -186,4 +186,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

+ 61 - 14
src/HDrpManagement/Creditbilladj/modules/enterpriseTable/add.vue

@@ -1,7 +1,7 @@
 <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">
+    <el-button size="mini" type="primary" @click="onShow">添 加</el-button>
+    <el-drawer title="添加经销商" size="70%" append-to-body :show-close="false" :visible.sync="dialogFormVisible" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
@@ -59,7 +59,7 @@
             label="账户类型"
             width="250">
             <template slot-scope="scope">
-              <el-select size="small" @focus="accountSelect(scope.row)" v-model="scope.row.sa_accountclassid" placeholder="请选择账户类型">
+              <el-select size="small" @focus="accountSelect(scope.row)" v-model="scope.row.sa_accountclassid" placeholder="请选择账户类型" @change="onChange(scope.row,scope.$index)">
                 <el-option
                   v-for="item in accountList"
                   :key="item.sa_accountclassid"
@@ -76,6 +76,13 @@
               <el-input type="text" size="small" placeholder="额度" v-model.number="scope.row.creditquota"></el-input>
             </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.historyCreditquota"></el-input>
+            </template>
+          </el-table-column>
           <el-table-column
               prop="remarks"
               label="备注">
@@ -90,7 +97,7 @@
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">提 交</el-button>
       </div>
     </el-drawer>
-    
+
   </div>
 </template>
 <script>
@@ -102,7 +109,7 @@ export default {
       dialogFormVisible2:false,
       accountList:[],
       form:{
-    
+
       },
       rules:{
       },
@@ -129,26 +136,34 @@ export default {
           "sa_creditbillid":this.$route.query.id
         }
       },
-      selectArr:[]
+      selectArr:[],
+      historyCreditquota:'',
     }
   },
   components:{selectEnterpise},
   methods:{
+    onShow(){
+      this.dialogFormVisible = true
+      this.getEnterpriseData()
+    },
     // /* 获取企业档案 */
     async getEnterpriseData() {
       let res = await this.$api.requested(this.params)
       this.total = res.total
       this.list = res.data
-      console.log(this.list);
+
+      this.selectArr = []
+
     },
     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 || item.creditquota === 0))
       if (is) {
         let data = this.selectArr.map(item => {
@@ -173,6 +188,7 @@ export default {
           this.$refs['form'].resetFields();
           this.dialogFormVisible2 = false
           this.dialogFormVisible = false
+          this.selsectAccount = false
         })
       } else {
         this.$message({
@@ -180,11 +196,11 @@ export default {
           message:'请填写完整信息'
         })
       }
-      
+
     },
     accountSelect (data) {
-      console.log('触发');
-      
+      console.log('触发',data);
+
       this.accountParam.content.sys_enterpriseid=data.sys_enterpriseid
       this.getAccountList()
     },
@@ -204,9 +220,40 @@ export default {
       this.params.content.pageNumber = val
       this.getEnterpriseData()
     },
+    /*查询信用额度*/
+    async queryBalance(accountno,data,index){
+      const res = await this.$api.requested({
+        "accesstoken": "825a4e9348176c31a66b78289f8e8d26",
+        "id": 20221008145903,
+        "content": {
+          "where": {
+            "sys_enterpriseid":  this.accountParam.content.sys_enterpriseid,
+            "accountno": accountno
+          }
+        }
+      })
+      data.historyCreditquota = res.data[0].creditquota
+      this.$set(this.selectArr,index,data)
+    },
+    /*选择账号类型*/
+    onChange(data,index){
+
+      this.selsectAccount = true
+      this.accountList.forEach(item=>{
+        if (item.sa_accountclassid === data.sa_accountclassid){
+          this.queryBalance(item.accountno,data,index)
+        }
+      })
+    },
+    onClose(){
+      this.historyCreditquota = ''
+      this.$refs['form'].resetFields();
+      this.dialogFormVisible2 = false
+      this.dialogFormVisible = false
+      this.selsectAccount = false
+    }
   },
   created() {
-    this.getEnterpriseData()
     this.tablecols = this.tool.tabelCol(this.$route.name).addEnterpriseTable.tablecols
   },
   mounted () {
@@ -218,4 +265,4 @@ export default {
 /deep/.el-select {
   width: 100%!important;
 }
-</style>
+</style>

+ 6 - 3
src/HDrpManagement/orderManage/modules/add.vue

@@ -67,7 +67,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12"  v-if="form.type !=='工具订单' && form.type !=='项目订单'">
+            <el-col :span="12"  v-if="form.type !=='工具订单' && form.type !=='项目订单' && form.typemx !== '工程' && form.typemx !== '电商'">
               <el-form-item label="选择领域" prop="tradefield">
                 <el-select :disabled="form.type==='促销订单'" v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
                   <el-option v-for="(item, index) in tradefieldOptions" :key="index" :label="item.tradefield"
@@ -162,7 +162,7 @@ export default {
           message: '请选择合同',
           trigger: 'change'
         }],
-        
+
       },
       sa_brandidOptions: [],
       tradefieldOptions: [],
@@ -206,6 +206,9 @@ export default {
       console.log(this.form)
       this.$refs['form'].validate(async valid => {
         if (!valid) return
+        if (this.form.typemx === '电商' || this.form.typemx === '工程'){
+          this.form.tradefield = ''
+        }
         const res = await this.$api.requested({
           "id":this.form.type ==='项目订单'?20230103141402: 20221108111402,
           "content":this.form
@@ -310,4 +313,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>