Merge branch 'xiaoqin' into mergeBranch

src/Form/Creditbilladj/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible">
+    <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">

src/Form/Creditbilladj/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-dialog title="编 辑" :visible.sync="dialogFormVisible">
+    <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">

src/HDrpManagement/AccountMoney/index.vue

@@ -7,37 +7,44 @@
       tableName="accountMoneyTable" 
       :apiId="{query:20221008145903}"
       :options="options">
-      <div slot="custom">
-        <el-select 
-          v-model="sys_enterpriseid" 
-          placeholder="企业筛选" 
-          size="mini" 
-          @change="enterpriseChange" 
-          clearable 
-          @clear="enterpriseChange($refs.list.param.content.where.sys_enterpriseid='')"
-        >
-          <el-option
-            v-for="item in enterpriseList"
-            :key="item.sys_enterpriseid"
-            :label="item.enterprisename"
-            :value="item.sys_enterpriseid">
-          </el-option>
-        </el-select>
-        <el-select 
-          v-model="accountType" 
-          placeholder="账户名称筛选" 
-          size="mini" 
-          @change="accountChange" 
-          clearable 
-          @clear="accountChange($refs.list.param.content.where.accountname='')"
-        >
-          <el-option
-            v-for="(item,index) in accountTypeList"
-            :key="index"
-            :label="item.value"
-            :value="item.value">
-          </el-option>
-        </el-select>
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <span class="search__label">企业: </span>
+            <el-select 
+              v-model="sys_enterpriseid" 
+              placeholder="企业筛选" 
+              size="small" 
+              @change="enterpriseChange" 
+              clearable 
+              @clear="enterpriseChange($refs.list.param.content.where.sys_enterpriseid='')"
+            >
+              <el-option
+                v-for="item in enterpriseList"
+                :key="item.sys_enterpriseid"
+                :label="item.enterprisename"
+                :value="item.sys_enterpriseid">
+              </el-option>
+            </el-select>
+        </div>
+        <div class="label_enter" style="margin-right:10px">
+          <span class="search__label">账户类型: </span>
+            <el-select 
+              v-model="accountType" 
+              placeholder="账户类型筛选" 
+              size="small" 
+              @change="accountChange" 
+              clearable 
+              @clear="accountChange($refs.list.param.content.where.accountname='')"
+            >
+              <el-option
+                v-for="item in accountTypeList"
+                :key="item.accountno"
+                :label="item.accountname"
+                :value="item.accountname">
+              </el-option>
+            </el-select>
+        </div>
+        
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'province'">
@@ -63,14 +70,13 @@ export default {
       options:[],
       enterpriseList:'',
       accountType:'',
-      accountTypeList:'',
-      sys_enterpriseid:''
+      sys_enterpriseid:'',
+      accountTypeList:[]
     }
   },
   async created () {
     this.getEnterprise()
-    let res = await this.$store.dispatch('optiontypeselect','accountname')
-    this.accountTypeList = res.data
+    this.getAccountType()
   },
   methods:{
     /** 获取公司数据 */
@@ -87,6 +93,17 @@ export default {
       })
       this.enterpriseList = res.data
     },
+    async getAccountType () {
+      let res = await this.$api.requested({
+        "id":20221008134803,
+        "content": {
+
+        }
+      })
+      this.accountTypeList = res.data
+      console.log(this.accountTypeList);
+      
+    },
     /* 企业筛选 */
     enterpriseChange () {
       this.$refs.list.param.content.where.sys_enterpriseid = this.sys_enterpriseid

src/HDrpManagement/AccountMoney/modules/detail.vue

@@ -1,32 +1,40 @@
 <template>
   <div>
-    <el-button size="mini" type="text" @click="editBtn">详 情</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible" width="80%">
-      <div slot="title" style="font-size: 15px">
-        资金流水账
+    <el-button size="mini" type="text" @click="editBtn">明 细</el-button>
+    <el-drawer title="账户流水明细" append-to-body :visible.sync="dialogFormVisible" size="50%">
+      <div class="container">
+        <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
+        <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="600px">
+          <template v-slot:customcol="scope">
+            <p>{{scope.column.data[scope.column.columnname]}}</p>
+          </template>
+          <template v-slot:opreation="scope">
+            <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
+            <delete-btn 
+              @deleteCreate="deleteCreate" 
+              v-if="tool.checkAuth($route.name,'delete')" 
+              :id="scope.data.sa_itempriceadjust_itemsid" 
+              @deleteSuccess="$refs.basicLayout.listData()" 
+              nameId="20221025095404" 
+              nameKey="sa_itempriceadjust_itemsids"
+            />
+          </template>
+        </tableLayout>
+        <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>
-      <basicLayout 
-        ref="basicLayout" 
-        formPath="" 
-        tableName="accountMoneyDetailTable" 
-        idName="sa_accountclassid" 
-        :apiId="{query:20221022161304,del:''}" 
-        :options="options"
-        @listCreate="list">
-        <div slot="custom"></div>
-        <template v-slot:tbList="scope">
-          <div v-if="scope.data.column.columnname === 'isorder'">
-            <span v-if="scope.data.column.data[scope.data.column.columnname] === 1">是</span>
-            <span v-else>否</span>
-          </div>
-          <div v-else>
-            {{scope.data.column.data[[scope.data.column.columnname]]}}
-          </div>
-        </template>
-        <template v-slot:tbOpreation="scope">
-        </template>
-      </basicLayout>
-    </el-dialog>
+
+    </el-drawer>
     
   </div>
 </template>
@@ -40,21 +48,48 @@ export default {
   data() {
     return {
       options:[],
-      dialogFormVisible:false
+      dialogFormVisible:false,
+      total:0,
+      list:[],
+      tablecols:[],
+      params: {
+        "id":20221022161304,
+        "content": {
+          "pageNumber":1,
+          "pageSize":20,
+          "sa_accountclassid":"",
+          "sys_enterpriseid":"",
+          "minAmount":20,
+          "maxAmount":0,
+          "where": {
+            "condition":""
+          }
+        }
+      }
     }
   },
+  created () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['accountMoneyDetailTable'].tablecols
+    this.getList()
+  },
   methods: {
     editBtn () {
+      this.getList()
       this.dialogFormVisible = true
     },
-    list (param) {
-      console.log(this.rowData);
-      
-      param.content.sa_accountclassid = this.rowData.sa_accountclassid
-      param.content.sys_enterpriseid = this.rowData.sys_enterpriseid
-      param.content.minAmount = 20
-      param.content.maxAmount = 0
-    }
+    async getList () {
+      this.params.content.sa_accountclassid = this.rowData.sa_accountclassid
+      this.params.content.sys_enterpriseid = this.rowData.sys_enterpriseid
+      let res = await this.$api.requested(this.params)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+    },
   }
 }
 </script>

src/HDrpManagement/Creditbilladj/index.vue

@@ -7,7 +7,8 @@
       tableName="creditbilladjTable" 
       idName="sa_creditbillid" 
       :apiId="{query:20221008155103,del:20221008155403}"
-      :options="options">
+      :options="options"
+      :detailPath="{path:'/creditbilladjDetail'}">
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'" :style="scope.data.column.data[[scope.data.column.columnname]] == '审核' ? 'color: rgb(82, 196, 25);' : ''">{{scope.data.column.data[[scope.data.column.columnname]]}}</div>
         <div v-else>
@@ -16,7 +17,6 @@
       </template>
       <template v-slot:tbOpreation="scope">
         <el-button size="mini" type="text" @click="checkBuill(scope.data.data)" v-if="scope.data.data.status == '新建'">审 核</el-button>
-        <el-button size="mini" type="text" @click="$router.push({path:'/creditbilladjDetail',query:{id:scope.data.data.sa_creditbillid,rowindex:scope.data.data.rowindex}})">详 情</el-button>
       </template>
     </basicLayout>
   </div>

src/HDrpManagement/productMoneyOdd/components/add.vue

@@ -0,0 +1,116 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="dialogFormVisible=true">新 增</el-button>
+    <el-drawer title="新 增 商 品" append-to-body :visible.sync="dialogFormVisible" size="50%">
+      <div class="container">
+        <el-input style="width:200px;margin-bottom:10px" size="small" placeholder="请输入商品" @clear="getProductList(params.content.pageNumber=1)"
+          @keyup.native.enter="getProductList(params.content.pageNumber=1)" v-model="params.content.where.condition" clearable />
+        <Table ref="table" :layout="tablecols" :data="productList" :custom="false" height="500px">
+        </Table>
+        <el-pagination
+          style="text-align:right;margin-top:10px"
+          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 class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible = 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 Table from './table'
+export default {
+  components:{Table},
+  name: "index",
+  data() {
+    return {
+      options:[],
+      dialogFormVisible: false,
+      productList:'',
+      selectProduct:[],
+      params: {
+        "id": 20221028154004,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        }
+      },
+      total:0,
+      tablecols:[]
+    }
+  },
+  provide () {
+    return {
+    }
+  },
+  watch: {
+    dialogFormVisible (val) {
+      !val ? this.$refs.table.$refs.tables.clearSelection() : ''
+    }
+  },
+  mounted () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['productList'].tablecols
+    this.getProductList()
+  },
+  methods: {
+    /* 提交 */
+    async onSubmit () {
+      let content = this.$refs.table.allArr.map(item => {
+        return {
+          "sa_itempriceadjust_itemsid":0,
+          "itemid":item.itemid,
+          "remarks":""
+        }
+      })
+      let res = await this.$api.requested({
+        "id": "20221025095104",
+        "content": {
+            "sa_itempriceadjustid": this.$route.query.id,
+            "sa_itempriceadjust_items": content
+        }
+      })
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+        this.dialogFormVisible = false
+      })
+    },
+    checkboxCallBack (data) {
+      this.selectProduct = data
+    },
+    /* 获取可添加的商品 */
+    async getProductList () {
+      let res = await this.$api.requested(this.params)
+      this.productList = res.data
+      this.total = res.total
+      console.log(this.productList);
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.getProductList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.getProductList()
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/productMoneyOdd/components/check.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="inline-16" style="width:100%">
+  <div class="inline-16">
     <el-popconfirm title="确定通过审核吗？" @confirm="CheckRow()">
-      <el-button slot="reference" size="mini" style="width:100%">审 核</el-button>
+      <el-button slot="reference" size="mini">审 核</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -1,81 +1,81 @@
 <template>
   <div>
     <el-button size="mini" type="text" @click="editBtn">编 辑 价 格</el-button>
-    <el-dialog title="编 辑" append-to-body :visible.sync="dialogFormVisible" width="50%">
-      <div slot="title" style="font-size: 15px">
-        编辑价格调整单商品价格
+    <el-drawer title="编辑价格调整单商品价格" append-to-body :visible.sync="dialogFormVisible" width="50%">
+      <div class="container">
+        <el-row>
+          <el-form :model="form" :rules="rules" ref="form" label-width="100px" label-position="right" size="mini">
+            <!-- <el-col :span="24">
+              <el-form-item label="价格等级" prop="pricegrade">
+                <el-select v-model="form.pricegrade" placeholder="请选择价格等级">
+                  <el-option
+                      v-for="item in priceGrade()"
+                      :key="item.rowindex"
+                      :label="item.value"
+                      :value="item.rowindex">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+              <el-form-item label="一级原价" prop="price">
+                <el-input size="mini" :disabled="form.oldprice1==0" placeholder="请输入调整价" v-model="form.oldprice1"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="一级调整价" prop="price1">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice1==0" v-model="form.price1"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="二级原价" prop="price">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice2==0" v-model="form.oldprice2"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="二级调整价" prop="price2">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice2==0" v-model="form.price2"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="三级原价" disabled prop="price">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice3==0" v-model="form.oldprice3"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="三级调整价" prop="price3">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice3==0" v-model="form.price3"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="四级原价" disabled prop="price">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice4==0"  v-model="form.oldprice4"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="四级调整价" prop="price4">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice4==0" v-model="form.price4"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="五级原价" disabled prop="oldprice5">
+                <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice5==0"  v-model="form.oldprice5"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="五级调整价" prop="price5">
+                <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice5==0" v-model="form.price5"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
       </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="right" size="mini">
-          <!-- <el-col :span="24">
-            <el-form-item label="价格等级" prop="pricegrade">
-              <el-select v-model="form.pricegrade" placeholder="请选择价格等级">
-                <el-option
-                    v-for="item in priceGrade()"
-                    :key="item.rowindex"
-                    :label="item.value"
-                    :value="item.rowindex">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <el-col :span="12">
-            <el-form-item label="一级原价" prop="price">
-              <el-input size="mini" :disabled="form.oldprice1==0" placeholder="请输入调整价" v-model="form.oldprice1"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="一级调整价" prop="price1">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice1==0" v-model="form.price1"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="二级原价" prop="price">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice2==0" v-model="form.oldprice2"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="二级调整价" prop="price2">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice2==0" v-model="form.price2"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="三级原价" disabled prop="price">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice3==0" v-model="form.oldprice3"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="三级调整价" prop="price3">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice3==0" v-model="form.price3"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="四级原价" disabled prop="price">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice4==0"  v-model="form.oldprice4"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="四级调整价" prop="price4">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice4==0" v-model="form.price4"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="五级原价" disabled prop="oldprice5">
-              <el-input size="mini" placeholder="请输入调整价"  :disabled="form.oldprice5==0"  v-model="form.oldprice5"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="五级调整价" prop="price5">
-              <el-input size="mini" placeholder="请输入调整价" :disabled="form.oldprice5==0" v-model="form.price5"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+      
+      <div class="fixed__btn__panel">
         <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>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
@@ -115,6 +115,9 @@ export default {
         ],
         price4:[
           { required: true, message: '请输入4级调整价', trigger: 'blur'},
+        ],
+        price5:[
+          { required: true, message: '请输入5级调整价', trigger: 'blur'},
         ]
       }
     }

src/HDrpManagement/productMoneyOdd/components/table.vue

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <el-table ref="tables"  @select="aaaa" @select-all="selectAll" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" style="width:100%"  border>
+        <el-table-column
+        type="selection"
+        width="45"
+        align="center"
+        fixed>
+      </el-table-column>
+      <el-table-column :show-overflow-tooltip="col.title == '来源' || col.title == '地址' || col.title == '备注'" v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width" :fixed="col.columnname === fixedName?'right':false">
+        <template slot-scope="scope">
+          <!-- 自定义表格显示内容 -->
+          <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+          <!-- 否则就是默认 -->
+          <span v-else>{{scope.row[col.columnname]}}</span>
+          <!-- 操作结构内容 -->
+          <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','fixedName'],
+  data () {
+    return {
+      list:[],
+      allArr:[]
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  watch: {
+    data (val) {
+      this.data.forEach((row) => {
+        this.allArr.forEach(item => {
+          if (row.itemid == item.itemid) {
+            this.$nextTick(() => {
+              this.$refs["tables"].toggleRowSelection(row, true);
+            })
+          }
+        })
+      });    
+    },
+    allArr (val) {
+      this.$emit('upDateData',val)
+    }
+  },
+  methods:{
+    aaaa(e,a) {
+      let index = this.allArr.findIndex(v=>v.itemid == a.itemid)
+      if(index == -1) {
+        this.allArr.push(a)
+      } else {
+        this.allArr.splice(index,1)
+      }
+    },
+    selectAll (val) {
+      if (val.length == 0) {
+        this.data.forEach(item => {
+          this.allArr.splice(item,1)
+        })
+      } else {
+        val.forEach(item => {
+          let res = this.allArr.every(item2 => item.itemid != item2.itemid)
+          res ? this.allArr.push(item) : ''
+        })
+      }
+    },
+  },
+}
+
+</script>
+<style scoped>
+
+/deep/.el-table__header .DisableSelection > .cell {
+  display: none !important;
+}
+</style>

src/HDrpManagement/productMoneyOdd/index.vue

@@ -15,7 +15,11 @@
         </importFile>
       </div>
       <template v-slot:tbList="scope">
-        <div>
+        <div v-if="scope.data.column.columnname == 'status'">
+          <span v-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'" style="color:rgb(82, 196, 26)">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
       </template>

src/HDrpManagement/productMoneyOdd/modules/detail.vue

@@ -14,20 +14,8 @@
     <!-- 使用此插槽可不传[tags] -->
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
-      <el-popover
-            placement="bottom"
-            width="50"
-            trigger="focus"
-            v-model="visible"
-        >
-        <div class="normal-margin">
-          <Check v-if="mainData.status == '新建' && tool.checkAuth($route.name,'check')" :rowData="mainData" @checkSuccess="queryMainData"/>
-        </div>
-        <div class="normal-margin">
-          <delete-btn type="detail" style="width:100%" v-if="tool.checkAuth($route.name,'delete')" :id="$route.query.id" @deleteSuccess="onSuccess" nameId="20221025092904" nameKey="sa_itempriceadjustids"/>
-        </div>
-        <el-button size="mini" slot="reference" icon="el-icon-more" @click="visible = !visible"></el-button>
-      </el-popover>
+      <Check v-if="mainData.status == '新建' && tool.checkAuth($route.name,'check')" :rowData="mainData" @checkSuccess="queryMainData"/>
+      <!-- <delete-btn type="detail" style="width:100%" v-if="tool.checkAuth($route.name,'delete')" :id="$route.query.id" @deleteSuccess="onSuccess" nameId="20221025092904" nameKey="sa_itempriceadjustids"/> -->
     </div>
     <div slot="slot0" class="container normal-panel">
       <productOddDetail :rowData="mainData"/>

src/HDrpManagement/productMoneyOdd/modules/productOddDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <basicLayout 
+    <!-- <basicLayout 
       ref="basicLayout" 
       formPath="productMoneyOdd/productOddDetail" 
       tableName="productDetailTable" 
@@ -29,21 +29,66 @@
         <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data.data"/>
         <delete-btn @deleteCreate="deleteCreate" v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.data.sa_itempriceadjust_itemsid" @deleteSuccess="$refs.basicLayout.listData()" nameId="20221025095404" nameKey="sa_itempriceadjust_itemsids"/>
       </template>
-    </basicLayout>
+    </basicLayout> -->
+    <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getDetailList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getDetailList(params.content.pageNumber=1)"></el-input>
+    <addPrice class="inline-16" v-if="tool.checkAuth($route.name,'update')" @onSuccess="getDetailList(params.content.pageNumber=1)"/>
+    <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="400px">
+      <template v-slot:customcol="scope">
+        <p>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
+        <delete-btn 
+          @deleteCreate="deleteCreate" 
+          v-if="tool.checkAuth($route.name,'delete')" 
+          :id="scope.data.sa_itempriceadjust_itemsid" 
+          @deleteSuccess="$refs.basicLayout.listData()" 
+          nameId="20221025095404" 
+          nameKey="sa_itempriceadjust_itemsids"
+        />
+      </template>
+    </tableLayout>
+    <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>
 import priceHelper from '../components/priceHelper'
 import editPrice from '../components/editPrice'
+import addPrice from '../components/add'
+import { log } from '@antv/g2plot/lib/utils'
 
 export default {
-  components:{priceHelper,editPrice},
+  components:{priceHelper,editPrice,addPrice},
   name: "index",
   data() {
     return {
       options:[],
-      productList:''
+      productList:'',
+      tablecols:[],
+      total:0,
+      list:[],
+      params: {
+        "id":20221025160904,
+        "content":{
+          "pageNumber":1,
+          "pageSize":20,
+          "where": {
+            "condition":""
+          }
+        }
+      }
     }
   },
   provide () {
@@ -52,14 +97,28 @@ export default {
     }
   },
   mounted () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['productDetailTable'].tablecols
     this.getProductList()
+    this.getDetailList()
   },
   methods: {
+    async getDetailList () {
+      this.params.content.sa_itempriceadjustid = this.$route.query.id
+      let res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(res);
+    },
     deleteCreate (param) {
       param.content.sa_itempriceadjustid = this.$route.query.id
     },
-    list (param) {
-      param.content.sa_itempriceadjustid = this.$route.query.id
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
     },
     /* 获取可添加的商品 */
     async getProductList () {

src/SManagement/sales_forecast/modules/projectDetail.vue

@@ -86,7 +86,7 @@ export default {
   created() {
     this.getDetail()
     this.getSubmitList()
-    this.tablecols = this.tool.tabelCol(this.$route.name).salesEditTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).salesEditTable.tablecols.splice(0,8)
   },
   methods: {
     /* 获取头部详情 */

src/router/HDrpManagement.js

@@ -138,16 +138,19 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/index')
-  },{
-    path: '/creditbilladjDetail',
-    name:'creditbilladj',
-    meta: {
-      title: '信用额度调整单详情',
-      ast_nav: true,
-      keeproute: true,
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/modules/details')
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/index'),
+    children: [
+      {
+        path: '/creditbilladjDetail',
+        name:'creditbilladj',
+        meta: {
+          title: '信用额度调整单详情',
+          ast_nav: true,
+          keeproute: true,
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/Creditbilladj/modules/details')
+      },
+    ]
   },{
     path: '/accountmoney',
     name:'accountmoney',