2023-5-8

src/HDrpManagement/orderManage/details/index.vue

@@ -62,8 +62,8 @@
                   <p class="inline-16"><small>账户名称:&nbsp;</small>{{mainData.accountclass.accountname?mainData.accountclass.accountname:'未选择账户'}}</p>
                   <p class="inline-16"><small>账户余额:&nbsp;</small><b>¥{{tool.formatAmount(mainData.accountclass.balance?mainData.accountclass.balance:0,2)}}</b></p>
 
-                  <p><small>信用额度:&nbsp;</small>{{mainData.accountclass.creditquota ? tool.formatAmount(mainData.accountclass.creditquota,2) : mainData.accountclass.creditquota}}</p>&nbsp;
-                  <p><small>本单金额:&nbsp;</small>{{mainData.rebate_used ? tool.formatAmount(mainData.defaultamount - rebateamount,2) : mainData.defaultamount}}</p>
+                  <p><small>信用额度:&nbsp;</small>{{mainData.accountclass.creditquota ? tool.formatAmount(mainData.accountclass.creditquota,2) : tool.formatAmount(mainData.accountclass.creditquota)}}</p>&nbsp;
+                  <p><small>本单金额:&nbsp;</small>{{mainData.rebate_used ? tool.formatAmount(mainData.defaultamount - rebateamount,2) : tool.formatAmount(mainData.defaultamount)}}</p>
                 </div>
                 <div v-if="(mainData.type === '标准订单' ||  mainData.type === '特殊订单') && isusedrebate === 1">
                   <div v-if="checked" class="flex-align-center">
@@ -474,7 +474,7 @@ export default {
       const res = await this.$api.requested({
         "id": 20221108164502,
         "content": {
-          "sa_orderids":[this.$route.query.id]
+          "sa_orderid":this.$route.query.id
         },
       })
       this.tool.showMessage(res,()=>{

src/HDrpManagement/serveBill/components/selectOrder.vue

@@ -50,7 +50,7 @@
             small
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="currentPage"
+            :current-page="param.content.pageNumber"
             :page-size="param.content.pageSize"
             layout="total, prev, pager, next, jumper"
             :total="total">
@@ -73,6 +73,8 @@ export default {
         "version":1,
         "content": {
             "sys_enterpriseid":1,
+            "pageNumber":1,
+            "pageSize":20,
           "where":{
               "condition":""
           }

src/HDrpManagement/serveBillMag/components/selectOrder.vue

@@ -54,7 +54,7 @@
             small
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="currentPage"
+            :current-page="param.content.pageNumber"
             :page-size="param.content.pageSize"
             layout="total, prev, pager, next, jumper"
             :total="total">
@@ -77,6 +77,8 @@ export default {
         "version":1,
         "content": {
             "sys_enterpriseid":1,
+            "pageNumber":1,
+            "pageSize":20,
           "where":{
               "condition":""
           }

src/HDrpManagement/serveBillMag/modules/product/add.vue

@@ -7,7 +7,7 @@
       </div>
       <div class="drawer__panel">
         <el-input style="width:250px;margin-bottom:10px" size="small" placeholder="请输入搜索内容" clearable @clear="getOrderList(params.content.pageNumber=1)" v-model="params.content.where.condition" @keyup.enter.native="getOrderList(params.content.pageNumber=1)"></el-input>
-        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="sa_serviceorderitemsid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
+        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="itemid" ref="table" v-model="result" :layout="tablecols" :data="orderList" :custom="true" height="500px"  @upDateData="upDateData">
            <template v-slot:customcol="scope">
               <div>{{scope.column.data[scope.column.columnname]}}</div>
             </template>
@@ -94,7 +94,8 @@ export default {
         return {
           "sa_serviceorderitemsid": 0, 
           "itemid": item.itemid, 
-          "reason": ''
+          "reason": '',
+          "qty":1
         }
       })
       let res = await this.$api.requested({

src/HManagement/department/modules/dep_list.vue

@@ -56,6 +56,7 @@ export default {
         var elNode = {
           label: node["depname"],
           parentid:node['parentid'],
+          parentname:node['parentname'],
           departmentid:node["departmentid"],
           value:node["departmentid"],
           remarks:node["remarks"],

src/HManagement/department/modules/edit_dep.vue

@@ -30,6 +30,20 @@
               <el-input class="item_width-full" v-model="form.sequence" placeholder="请输入部门排序号" autocomplete="off"></el-input>
             </el-form-item>
           </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="上级部门">
+              <select-area ref="selectArea" @onClick="onClick">
+                <el-input 
+                  type="text" 
+                  size="small" 
+                  v-model="form.parentname" 
+                  slot="input" 
+                  placeholder="请选择上级部门"
+                  @focus="$refs.selectArea.dialogDepVisible=true"
+                ></el-input>
+              </select-area>
+            </el-form-item>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="是否启用">
               <el-checkbox v-model="form.isused" :false-label="0" :true-label="1">是否启用</el-checkbox>
@@ -46,8 +60,10 @@
 </template>
 
 <script>
+import selectArea from './selectArea'
 export default {
   props:['data'],
+  components:{selectArea},
   data () {
     return {
       dialogDepVisible:false,
@@ -63,7 +79,9 @@ export default {
         ]
       },
       form:{
-        depname:''
+        depname:'',
+        parentid:'',
+        parentname:''
       }
     }
   },
@@ -86,6 +104,11 @@ export default {
           this.dialogDepVisible = false
         })
       });
+    },
+    onClick (data) {
+      console.log(data,111);
+      this.form.parentid = data.departmentid
+      this.form.parentname = data.label
     }
   }
 }

src/HManagement/department/modules/selectArea.vue

@@ -0,0 +1,46 @@
+<template>
+  <div>
+    <slot name="input"></slot>
+    <el-dialog title="选择上级部门" append-to-body width="500px" :visible.sync="dialogDepVisible">
+      <areaTree ref="arealist" style="width:400px" @onClick="onClick">
+      </areaTree>
+      <div class="dialog-footer">
+        <el-button size="small" @click="dialogDepVisible = 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-dialog>
+  </div>
+</template>
+
+<script>
+import areaTree from './dep_list'
+export default {
+  props:['data'],
+  components:{areaTree},
+  data () {
+    return {
+      dialogDepVisible:false,
+      selectArea:''
+    }
+  },
+  methods:{
+    onSubmit () {
+      this.dialogDepVisible = false
+      this.$emit('onClick',this.selectArea)
+    },
+    onClick (data) {
+      console.log(data,2222);
+      this.selectArea = data
+    }
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.item_width-full{
+  width:100%
+}
+
+</style>

src/SDrpManagement/agentOrder/details/index.vue

@@ -52,8 +52,8 @@
                   <p class="inline-16"><small>账户名称:&nbsp;</small>{{mainData.accountclass.accountname?mainData.accountclass.accountname:'未选择账户'}}</p>
                   <p class="inline-16"><small>账户余额:&nbsp;</small><b>¥{{tool.formatAmount(mainData.accountclass.balance?mainData.accountclass.balance:0,2)}}</b></p>
 
-                  <p><small>信用额度:&nbsp;</small>{{mainData.accountclass.creditquota ? tool.formatAmount(mainData.accountclass.creditquota,2) : mainData.accountclass.creditquota}}</p>&nbsp;
-                  <p><small>本单金额:&nbsp;</small>{{mainData.rebate_used ? tool.formatAmount(mainData.defaultamount - rebateamount,2) : mainData.defaultamount}}</p>
+                  <p><small>信用额度:&nbsp;</small>{{mainData.accountclass.creditquota ? tool.formatAmount(mainData.accountclass.creditquota,2) : tool.formatAmount(mainData.accountclass.creditquota)}}</p>&nbsp;
+                  <p><small>本单金额:&nbsp;</small>{{mainData.rebate_used ? tool.formatAmount(mainData.defaultamount - rebateamount,2) : tool.formatAmount(mainData.defaultamount)}}</p>
                 </div>
                 <div v-if="(mainData.type === '标准订单' ||  mainData.type === '特殊订单') && isusedrebate === 1">
                   <div v-if="checked" class="flex-align-center">

src/SDrpManagement/salerOrder/details/index.vue

@@ -52,8 +52,8 @@
                   <p class="inline-16"><small>账户名称:&nbsp;</small>{{mainData.accountclass.accountname?mainData.accountclass.accountname:'未选择账户'}}</p>
                   <p class="inline-16"><small>账户余额:&nbsp;</small><b>¥{{tool.formatAmount(mainData.accountclass.balance?mainData.accountclass.balance:0,2)}}</b></p>
 
-                  <p><small>信用额度:&nbsp;</small>{{mainData.accountclass.creditquota ? tool.formatAmount(mainData.accountclass.creditquota,2) : mainData.accountclass.creditquota}}</p>&nbsp;
-                  <p><small>本单金额:&nbsp;</small>{{mainData.rebate_used ? tool.formatAmount(mainData.defaultamount - rebateamount,2) : mainData.defaultamount}}</p>
+                  <p><small>信用额度:&nbsp;</small>{{mainData.accountclass.creditquota ? tool.formatAmount(mainData.accountclass.creditquota,2) : tool.formatAmount(mainData.accountclass.creditquota)}}</p>&nbsp;
+                  <p><small>本单金额:&nbsp;</small>{{mainData.rebate_used ? tool.formatAmount(mainData.defaultamount - rebateamount,2) : tool.formatAmount(mainData.defaultamount)}}</p>
                 </div>
                 <div v-if="(mainData.type === '标准订单' ||  mainData.type === '特殊订单') && isusedrebate === 1">
                   <div v-if="checked" class="flex-align-center">