Merge branch 'orangeUrgent' into mergeBranch

src/HDrpManagement/invoiceapp/index.vue

@@ -67,6 +67,9 @@
         <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
           <span>{{tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'redamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.redamount,2)}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/SDrpManagement/invoiceapp_saler/index.vue

@@ -66,7 +66,9 @@
         <div v-else-if="scope.data.column.columnname == 'byhand'">
           <span>{{scope.data.column.data.byhand == 1?'手工':'线上'}}</span>
         </div>
-
+        <div v-else-if="scope.data.column.columnname == 'redamount'">
+          <span>{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/SDrpManagement/salerAccount/index.vue

@@ -12,6 +12,10 @@
         <exportFile :param="param" :columns="tablecols" fileName="业务员账户"></exportFile>
       </template>
       <template #custom >
+        <div class="mt-10 inline-16">
+          <label  class="search__label" >部门:</label>
+          <el-cascader ref="selectdep" size="small" v-model="depment" :options="deplist" :props="{emitPath:true,expandTrigger:'hover',checkStrictly:true,label:'label',value:'departmentid',children:'children'}"  @change="selectDep"  clearable></el-cascader>
+        </div>
         <div class="mt-10">
           <label  class="search__label">状态:</label>
           <el-select class="inline-24" v-model="status" placeholder="请选择状态" @change="selectChange" size="small" clearable>
@@ -59,7 +63,13 @@ export default {
       tablecols:[],
       param:{},
       checked:'1',
-      goID:''
+      goID:'',
+      depment:'',
+      deplist:'',
+      depmentParam:{
+        "id": 20230620102004,
+        "content": {},
+      }
     }
   },
   methods:{
@@ -77,11 +87,75 @@ export default {
           id:row.hrid,
         }
       })
-    }
+    },
+    /*获取部门数据*/
+    async departmentrtment() {
+      const res = await this.$api.requested(this.depmentParam)
+      this.deplist = this.createMenu(res.data.dep)
+    },
+    createMenu (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        if (node.subdep.length === 0){
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+          }
+        }else {
+          var elNode = {
+            label: node["depname"],
+            parentid:node['parentid'],
+            parentname:node['parentname'],
+            departmentid:node["departmentid"],
+            value:node["departmentid"],
+            remarks:node["remarks"],
+            isused:node["isused"],
+            changedate:node['changedate'],
+            changeby:node['changeby'],
+            createdate:node['createdate'],
+            createby:node['createby'],
+            depno:node['depno'],
+            disabled:that.pageOnlyRead,
+            children: []
+          }
+        }
+        if (node.subdep && node.subdep.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subdep.length; index++) {
+            // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+            elNode.children.push(convertToElementTree(node.subdep[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
+    selectDep(val) {
+      this.$refs.basicLayout.param.content.where.departmentid = val[val.length -1]
+      this.param = this.$refs.basicLayout.param
+      this.$refs.basicLayout.listData()
+    },
   },
   mounted() {
     this.param = this.$refs.basicLayout.param
     this.selectChange()
+    this.departmentrtment()
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).accountTable.tablecols

src/SDrpManagement/sinvoiceapp/index.vue

@@ -1,13 +1,13 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="basicLayout" 
+    <basicLayout
+      ref="basicLayout"
       :oldFormPath="{
         add:'SDrpManagement/sinvoiceapp/modules'
       }"
-      tableName="invoiceTable" 
-      idName="sa_invoiceapplyid" 
+      tableName="invoiceTable"
+      idName="sa_invoiceapplyid"
       :apiId="{query:20221219133703,del:20221216143203}"
       :options="options"
       :detailPath="{
@@ -48,6 +48,12 @@
         <div v-else-if="scope.data.column.columnname == 'byhand'">
           <span>{{scope.data.column.data.byhand == 1?'是':'否'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
+          <span>{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'redamount'">
+          <span>{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
@@ -64,8 +70,8 @@
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
  * @param {string} tableName 开发端配置的表格名称
  * @param {String} idName 数据主id名称
- * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
- * @param {Array} options:{label:描述,value:值} 
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id}
+ * @param {Array} options:{label:描述,value:值}
  */
 export default {
   data () {
@@ -94,4 +100,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>