浏览代码

居间费结算单新增状态筛选、合同项目选择样式调整

qymljy 1 年之前
父节点
当前提交
79e9ed982f

+ 2 - 2
src/HDrpManagement/contractManage/components/addContract.vue

@@ -522,8 +522,8 @@
             <el-col :span="24">
               <el-form-item label="合同:" prop="ascription_title">
                 <el-popover
-                  placement="bottom"
-                  trigger="manual"
+                  placement="left"
+                  trigger="focus"
                   v-model="contractVisible"
                   width="700">
                   <selectContract  ref="contractRef" @onSelect="concratChange" @onCanel="contractVisible=false" ></selectContract>

+ 2 - 2
src/HDrpManagement/contractManage/components/editContract.vue

@@ -525,8 +525,8 @@
             <el-col :span="24">
               <el-form-item label="合同:" prop="ascription_title">
                 <el-popover
-                  placement="bottom"
-                  trigger="manual"
+                  placement="left"
+                  trigger="focus"
                   v-model="contractVisible"
                   width="700">
                   <selectContract ref="contractRef" @onSelect="concratChange" @onCanel="contractVisible=false"></selectContract>

+ 2 - 2
src/HDrpManagement/contractManage/components/selectContract.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="项目合同" name="项目">
         <el-input  style="width:200px;" placeholder="搜索"  :suffix-icon="projectParam.content.where.condition?projectParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="projectParam.content.where.condition" @keyup.native.enter="queryProject(projectParam.content.pageNumber = 1)" @clear="queryProject(projectParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
         </el-input>
-        <table-new-layout style="margin-top: 10px" :layout="projectTableCols" :data="projectList" :width="true" :custom="true" @rowClick="rowClick" height="500px">
+        <table-new-layout style="margin-top: 10px" :layout="projectTableCols" :data="projectList" :width="true" :custom="true" @rowClick="rowClick" height="450px">
           <template v-slot:customcol="scope">
             <p>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
@@ -26,7 +26,7 @@
       <el-tab-pane label="客户合同" name="客户">
         <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="customerParam.content.where.condition?customerParam.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="customerParam.content.where.condition" @keyup.native.enter="queryCustomer(customerParam.content.pageNumber = 1)" @clear="queryCustomer(customerParam.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
         </el-input>
-        <table-new-layout style="margin-top: 10px" :layout="customerTableCols" :data="customerList" :width="true" :custom="true" @rowClick="rowClick" height="500px">
+        <table-new-layout style="margin-top: 10px" :layout="customerTableCols" :data="customerList" :width="true" :custom="true" @rowClick="rowClick" height="450px">
           <template v-slot:customcol="scope">
             <p>{{scope.column.data[scope.column.columnname]}}</p>
           </template>

+ 10 - 2
src/HDrpManagement/rebatesettlement/index.vue

@@ -14,6 +14,13 @@
         path:'/rebatesettlement_detail'
       }">
       <template #custom>
+        <div class="mt-10 inline-16">
+          <label class="search__label" >状态:</label>
+          <el-select v-model="status" placeholder="请选择" @change="selectChange" size="small" clearable >
+            <el-option label="新建" value="新建"></el-option>
+            <el-option label="审核" value="审核"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker
@@ -58,8 +65,8 @@ export default {
   data () {
     return {
       options:[],
-      dateSelect:[]
-
+      dateSelect:[],
+      status:''
     }
   },
   mounted() {
@@ -75,6 +82,7 @@ export default {
         this.$refs.basicLayout.param.content.where.begindate = ''
         this.$refs.basicLayout.param.content.where.enddate = ''
       }
+      this.$refs.basicLayout.param.content.where.status = this.status
       this.$refs.basicLayout.listData()
     }
   }

+ 7 - 7
src/SDrpManagement/rebatesettlement/index.vue

@@ -1,13 +1,13 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="basicLayout" 
+    <basicLayout
+      ref="basicLayout"
       :oldFormPath="{
         add:'SDrpManagement/rebatesettlement/modules'
       }"
-      tableName="rebatesettlement" 
-      idName="sa_rebatesettlementid" 
+      tableName="rebatesettlement"
+      idName="sa_rebatesettlementid"
       :apiId="{query:20230104194002,del:20230104193402}"
       :autoQuery="false"
       :options="options">
@@ -45,8 +45,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 () {
@@ -77,4 +77,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>