2022-22-1

src/Form/productMoneyOdd/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="text" @click="editBtn">编 辑</el-button>
+    <el-button size="mini" @click="editBtn">编 辑</el-button>
     <el-dialog title="新 增" append-to-body :visible.sync="dialogFormVisible" width="30%">
       <div slot="title" style="font-size: 15px">
         新增价格调整单

src/Form/productMoneyOdd/productOddDetail/add.vue

@@ -31,7 +31,6 @@
 
 <script>
 export default {
-  inject:['rowData'],
   components:{},
   name: "index",
   data() {
@@ -62,7 +61,7 @@ export default {
       let res = await this.$api.requested({
         "id": "20221025095104",
         "content": {
-            "sa_itempriceadjustid": this.rowData().sa_itempriceadjustid,
+            "sa_itempriceadjustid": this.$route.query.id,
             "sa_itempriceadjust_items": content
         }
       })

src/Form/projectChange/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" width="50%">
+    <el-dialog title="新 增" append-to-body :visible.sync="dialogFormVisible" width="50%">
       <div slot="title" style="font-size: 15px">
         新增账户类型
       </div>
@@ -31,7 +31,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目类型" prop="projecttype">
-              <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="small">
+              <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
                 <el-option
                   v-for="(item,index) in projectType()"
                   :key="index"
@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目等级" prop="grade">
-              <el-select v-model="form.grade" placeholder="请选择项目等级" size="small">
+              <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
                 <el-option
                   v-for="item in projectLead()"
                   :key="item.rowindex"

src/Form/projectChange/edit.vue

@@ -31,7 +31,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目类型" prop="projecttype">
-              <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="small">
+              <el-select v-model="form.projecttype" placeholder="请选择项目类型" size="mini">
                 <el-option
                   v-for="(item,index) in projectType()"
                   :key="index"
@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目等级" prop="grade">
-              <el-select v-model="form.grade" placeholder="请选择项目等级" size="small">
+              <el-select v-model="form.grade" placeholder="请选择项目等级" size="mini">
                 <el-option
                   v-for="item in projectLead()"
                   :key="item.rowindex"

src/HDrpManagement/productMoneyOdd/components/check.vue

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

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -0,0 +1,167 @@
+<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">
+        编辑价格调整单商品价格
+      </div>
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" 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">
+        <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>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+export default {
+  name: "add",
+  components:{},
+  props:['data'],
+  inject:['priceGrade'],
+  data(){
+    return {
+      dialogFormVisible:false,
+      projectAddress:[],
+      priceArr:['price1','price2','price3','price4','price5'],
+      form:{
+        "price1":'',
+        "price2":'',
+        "price3":'',
+        "price4":'',
+        "price5":'',
+        "oldprice1":'',
+        "oldprice2":'',
+        "oldprice3":'',
+        "oldprice4":'',
+        "oldprice5":'',
+      },
+      rules:{
+        price1:[
+          { required: true, message: '请输入1级调整价', trigger: 'blur'},
+        ],
+        price2:[
+          { required: true, message: '请输入2级调整价', trigger: 'blur'},
+        ],
+        price3:[
+          { required: true, message: '请输入3级调整价', trigger: 'blur'},
+        ],
+        price4:[
+          { required: true, message: '请输入4级调整价', trigger: 'blur'},
+        ]
+      }
+    }
+  },
+  created () {
+  },
+  methods:{
+    editBtn () {
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onSubmit(){
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        let content = this.priceArr.map((item,index) => {
+          if (this.form[item] !== 0) {
+            return {
+              "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
+              "pricegrade":index + 1,
+              "price":this.form[item]
+            }
+          }          
+        }).filter(item => item)
+        const res = await this.$api.requested({
+            "id": "20221025165904",
+            "content": {
+                "sa_itempriceadjustid": this.data.sa_itempriceadjustid,
+                "sa_itempriceadjust_itemprice": content
+            }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    },
+  }
+}
+</script>
+
+<style scoped>
+/deep/.el-select {
+  height: 28px !important;
+  width: 100%;
+}
+/deep/.el-input__inner {
+  height: 28px !important;
+}
+</style>

src/HDrpManagement/productMoneyOdd/components/priceHelper.vue

@@ -0,0 +1,123 @@
+<template>
+  <div>
+    <el-button size="mini" @click="btn">调价助手</el-button>
+    <el-dialog title="产品调价助手" append-to-body :visible.sync="dialogFormVisible" width="30%">
+      <el-row :gutter="20">
+        <el-form :model="form" :rules="rules" ref="form" label-width="120px" label-position="left" size="mini">
+          <el-col :span="24">
+            <el-form-item label="产品名称" prop="itemid">
+              <el-select v-model="form.itemid" placeholder="请选择产品" size="small">
+                <el-option
+                  v-for="item in productList()"
+                  :key="item.itemid"
+                  :label="item.itemname"
+                  :value="item.itemid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调价等级" prop="pricegrade">
+              <el-radio-group v-model="form.pricegrade">
+                <el-radio :label="1">一级</el-radio>
+                <el-radio :label="2">二级</el-radio>
+                <el-radio :label="3">三级</el-radio>
+                <el-radio :label="4">四级</el-radio>
+                <el-radio :label="5">五级</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调价方式" prop="manner">
+              <el-radio-group v-model="form.manner">
+                <el-radio :label="1">按金额</el-radio>
+                <el-radio :label="0">按百分比</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="调价规则" prop="cardinality">
+              <el-radio-group v-model="form.cardinality">
+                <el-radio :label="1">上浮</el-radio>
+                <el-radio :label="0">下调</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="值" prop="coefficient">
+              <el-input size="mini" v-model="form.coefficient" placeholder="上浮或下调数据"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      <div class="dialog-footer">
+        <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>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  inject:['productList'],
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sa_itempriceadjustid":"",
+        "itemid":"", 
+        "pricegrade":"", //调价等级
+        "manner":"", // 调价方式 0 按百分比 1 定额
+        "cardinality":"", //调价规则 0 下调 1上浮
+        "coefficient":""  //下调或上浮  的 金额或百分比
+      },
+      rules:{
+        itemid:[
+          { required: true, message: '请选择商品', trigger: 'blur'},
+        ],
+        pricegrade:[
+          { required: true, message: '请选择调价等级', trigger: 'blur'},
+        ],
+        manner:[
+          { required: true, message: '请选择调价方式', trigger: 'blur'},
+        ],
+        cardinality:[
+          { required: true, message: '请选择调价规则', trigger: 'blur'},
+        ],
+        coefficient:[
+          { required: true, message: '请输入上浮或下浮金额', trigger: 'blur'},
+        ],
+      }
+    }
+  },
+  methods:{
+    btn () {
+      this.dialogFormVisible = true
+    },
+    onSubmit(){
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        this.form.sa_itempriceadjustid = this.$route.query.id
+        const res = await this.$api.requested({
+          "id": "20221027095504",
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+/deep/.el-select {
+  width: 100%;
+}
+</style>

src/HDrpManagement/productMoneyOdd/index.vue

@@ -6,7 +6,8 @@
       tableName="productMoneyOdddTable" 
       idName="sa_itempriceadjustid" 
       :apiId="{query:20221024163504,del:20221025092904}" 
-      :options="options">
+      :options="options"
+      :detailPath="{path:'/productMoneyOddDetail'}">
       <div slot="custom"></div>
       <template v-slot:tbList="scope">
         <div>
@@ -14,9 +15,9 @@
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <productOddDetail class="inline-16" :rowData="scope.data.data"/>
-        <Check v-if="scope.data.data.status == '新建' && tool.checkAuth($route.name,'check')" :rowData="scope.data.data" @checkSuccess="$refs.basicLayout.listData()"/>
-        <delete-btn v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.data.sa_itempriceadjustid" @deleteSuccess="$refs.basicLayout.listData()" nameId="20221025092904" nameKey="sa_itempriceadjustids"/>
+        <!-- <productOddDetail class="inline-16" :rowData="scope.data.data"/> -->
+        <!-- <Check v-if="scope.data.data.status == '新建' && tool.checkAuth($route.name,'check')" :rowData="scope.data.data" @checkSuccess="$refs.basicLayout.listData()"/> -->
+        <!-- <delete-btn v-if="tool.checkAuth($route.name,'delete')" :id="scope.data.data.sa_itempriceadjustid" @deleteSuccess="$refs.basicLayout.listData()" nameId="20221025092904" nameKey="sa_itempriceadjustids"/> -->
       </template>
     </basicLayout>
   </div>
@@ -31,23 +32,40 @@ export default {
   data() {
     return {
       options:[],
-      priceGrade:''
+      priceGrade:'',
+      productList:''
     }
   },
   provide () {
     return {
-      priceGrade: () => this.priceGrade
+      priceGrade: () => this.priceGrade,
+      productList: () => this.productList
     }
   },
   async created () {
     /* 获取价格等级 */
     let res = await this.$store.dispatch('optiontypeselect','pricegrade')
     this.priceGrade = res.data
-    console.log(this.priceGrade);
-    
+
+    this.getProductList()
   },
   methods: {
-    
+    /* 获取可添加的商品 */
+    async getProductList () {
+      let res = await this.$api.requested({
+          "accesstoken": "0930ace78dc873659508aaa361ebada7",
+          "id": 20221028154004,
+          "content": {
+              "pageNumber": 1,
+              "pageSize": 20,
+              "where": {
+                  "condition": ""
+              }
+          }
+      })
+      this.productList = res.data
+      console.log(this.productList);
+    },
   }
 }
 </script>

src/HDrpManagement/productMoneyOdd/modules/detail.vue

@@ -0,0 +1,120 @@
+
+<template>
+  <basicDetails 
+    ref="details"
+    :titleText="mainData.billno"
+    formPath="productMoneyOdd"
+    :editData="mainData"
+    :mainAreaData="mainAreaData" 
+    :turnPageId="20221024163504" 
+    idname="sa_itempriceadjustid"
+    @pageChange="pageChange"
+    :tabs="['商品明细']"
+    @onEditSuccess="queryMainData($route.query.id)">
+    <!-- 使用此插槽可不传[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>
+    </div>
+    <div slot="slot0" class="container normal-panel">
+      <productOddDetail :rowData="mainData"/>
+    </div>
+  </basicDetails>
+</template>
+
+<script>
+import productOddDetail from './productOddDetail'
+import Check from '../components/check'
+export default {
+  data () {
+    return {
+      mainData:{},
+      mainAreaData:'',
+      visible:false
+    }
+  },
+  components:{
+    productOddDetail,
+    Check
+  },
+  methods:{
+    onSuccess(){
+      this.visible = false
+      this.queryMainData(this.$route.query.id)
+      this.$emit('onSuccess')
+    },
+    async queryMainData (id) {
+      const res = await this.$api.requested({
+        "id": "20221025093404",
+        "version":1,
+        "content": {
+            "sa_itempriceadjustid":this.$route.query.id
+        }
+      })
+      this.mainData = res.data[0]
+      this.$refs.details.param.content.isExport = false
+      this.changeDataStructure()
+    },
+    // 监听切换数据,上一页,下一页
+    pageChange (id,rowindex) {
+      this.$router.replace({path:'/productMoneyOddDetail',query:{id:id,rowindex:rowindex}})
+      this.queryMainData(id)
+    },
+    changeDataStructure () {
+      this.mainAreaData = [
+        {
+          label:'单号',
+          value: this.mainData.billno
+        },
+        {
+          label:'状态',
+          value:this.mainData.status
+        },
+        {
+          label:'创建人',
+          value: this.mainData.createby
+        },
+        {
+          label:'创建时间',
+          value: this.mainData.createdate
+        },
+        {
+          label:'审核人',
+          value: this.mainData.checkby
+        },
+        {
+          label:'审核时间',
+          value: this.mainData.checkdate
+        },
+        {
+          label:'备注',
+          value: this.mainData.remarks
+        },
+      ]
+    }
+  },
+  mounted () {
+  },
+  created () {
+    // 验证权限
+    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    this.queryMainData(this.$route.query.id)
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/productMoneyOdd/modules/productOddDetail.vue

@@ -1,70 +1,62 @@
 <template>
   <div>
-    <el-button size="mini" type="text" @click="detailBtn">商 品 明 细</el-button>
-    <el-dialog title="新 增" :visible.sync="dialogFormVisible" width="80%">
-      <div slot="title" style="font-size: 15px">
-        商品价格调整单明细
+    <basicLayout 
+      ref="basicLayout" 
+      formPath="productMoneyOdd/productOddDetail" 
+      tableName="productDetailTable" 
+      idName="sa_itempriceadjustid" 
+      :apiId="{query:20221025160904,del:20221025095404}" 
+      :options="options"
+      @listCreate="list">
+      <div slot="custom">
+        <priceHelper/>
       </div>
-      <basicLayout 
-        ref="basicLayout" 
-        formPath="productMoneyOdd/productOddDetail" 
-        tableName="productDetailTable" 
-        idName="sa_itempriceadjustid" 
-        :apiId="{query:20221025160904,del:20221025095404}" 
-        :options="options"
-        @listCreate="list">
-        <div slot="custom"></div>
-        <template v-slot:tbList="scope">
-          <div v-if="scope.data.column.data[scope.data.column.columnname] === ''">
-          --
-          </div>
-          <div v-else-if="scope.data.column.columnname == 'province'">
-          {{`${scope.data.column.data['province']}、${scope.data.column.data['city']}、${scope.data.column.data['county']}`}}
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.data[scope.data.column.columnname] === ''">
+        --
         </div>
-          <div v-else>
-            {{scope.data.column.data[[scope.data.column.columnname]]}}
-          </div>
-        </template>
-        <template v-slot:tbOpreation="scope">
-          <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>
-    </el-dialog>
-    
+        <div v-else-if="scope.data.column.columnname == 'province'">
+        {{`${scope.data.column.data['province']}、${scope.data.column.data['city']}、${scope.data.column.data['county']}`}}
+      </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+        <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>
   </div>
 </template>
 
 <script>
+import priceHelper from '../components/priceHelper'
+import editPrice from '../components/editPrice'
+
 export default {
-  props:['rowData'],
-  components:{},
+  components:{priceHelper,editPrice},
   name: "index",
   data() {
     return {
       options:[],
-      dialogFormVisible: false,
       productList:''
     }
   },
   provide () {
     return {
-      rowData:() => this.rowData,
       productList:() => this.productList
     }
   },
   mounted () {
-    
+    this.getProductList()
   },
   methods: {
     deleteCreate (param) {
-      param.content.sa_itempriceadjustid = this.rowData.sa_itempriceadjustid
-    },
-    detailBtn () {
-      this.getProductList()
-      this.dialogFormVisible = true
+      param.content.sa_itempriceadjustid = this.$route.query.id
     },
     list (param) {
-      param.content.sa_itempriceadjustid = this.rowData.sa_itempriceadjustid
+      param.content.sa_itempriceadjustid = this.$route.query.id
     },
     /* 获取可添加的商品 */
     async getProductList () {

src/HDrpManagement/projectChange/components/del.vue

@@ -52,6 +52,7 @@ export default {
       })
       this.tool.showMessage(res,() => {
         this.$emit('deleteSuccess')
+        this.dialogTableVisible = false
       })
     },
   },

src/HDrpManagement/projectChange/index.vue

@@ -1,16 +1,5 @@
 <template>
   <div>
-    <div  class="my-tabs" style="padding:0 16px;margin-top:16px">
-      <el-tabs v-model="editableTabsValue" type="card" @tab-click="onChange">
-        <el-tab-pane
-            v-for="(item, index) in editableTabs"
-            :key="item.name"
-            :label="item.title"
-            :name="item.name"
-        >
-        </el-tab-pane>
-      </el-tabs>
-    </div>
     <basicLayout 
       style="padding-top:0 !important"
       ref="basicLayout" 
@@ -18,44 +7,38 @@
       tableName="projectTable" 
       idName="sa_projectid" 
       :apiId="{query:20221020143502,del:20221020144302}" 
-      :options="options">
-      <div slot="custom">
+      :options="options"
+      :detailPath="{path:'/projectChangeDetail',param:{tabIndex:editableTabsValue}}">
+      <div slot="custom" style="display:flex">
+        <el-select v-model="editableTabsValue" placeholder="筛选数据" @change="onChange" size="mini">
+          <el-option
+            v-for="item in editableTabs"
+            :key="item.name"
+            :label="item.title"
+            :value="item.name">
+          </el-option>
+        </el-select>
         <time-select @clearSelect="clearTime" @timeChange="timeChange"></time-select>
       </div>
       <template v-slot:tbList="scope">
         <div 
           v-if="scope.data.column.columnname == 'grade'"
-        >{{projectLead&&projectLead.find(item => item.rowindex==scope.data.column.data[scope.data.column.columnname]).value}}</div>
+        >{{projectLead&&projectLead.find(item => item.rowindex==scope.data.column.data[scope.data.column.columnname]) && projectLead.find(item => item.rowindex==scope.data.column.data[scope.data.column.columnname]).value}}</div>
         <div v-else-if="scope.data.column.data[scope.data.column.columnname] && scope.data.column.columnname != 'operation'">{{scope.data.column.data[[scope.data.column.columnname]]}}</div>
         <div v-else>
           --
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <el-button 
-          size="mini" 
-          type="text" 
-          class="inline-16" 
-          @click="$router.push({path:'/projectChangeDetail',query:{id:scope.data.data.sa_projectid,rowindex:scope.data.data.rowindex}})">详 情
-        </el-button>
-        <Del 
-          :id="scope.data.data.sa_projectid" 
-          :nameId="20221020144302" 
-          nameKey="sa_projectids" 
-          @deleteSuccess="$refs.basicLayout.listData()"
-          class="inline-16"
-          v-if="tool.checkAuth($route.name,'delete')"
-        />
       </template>
     </basicLayout>
   </div>
 </template>
 
 <script>
-import Del from './components/del'
 import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
 export default {
-  components:{Del,TimeSelect},
+  components:{TimeSelect},
   name: "index",
   provide () {
     return {
@@ -67,7 +50,7 @@ export default {
   },
   data() {
     return {
-      editableTabsValue:'0',
+      editableTabsValue:"0",
       /* 企业列表 */
       enterpriseList:'',
       /* 企业列表 */
@@ -159,7 +142,7 @@ export default {
     },
     onChange (val) {
       console.log(val)
-      this.$refs['basicLayout'].param.content.type = val.name
+      this.$refs['basicLayout'].param.content.type = this.editableTabsValue
       this.$refs['basicLayout'].param.content.isExport = 0
       this.$refs['basicLayout'].listData()
     },

src/HDrpManagement/projectChange/modules/detail.vue

@@ -31,6 +31,14 @@
           style="width:100%;margin-bottom:5px"
         />
         <Locked style="width:100%;margin-bottom:5px" v-if="tool.checkAuth($route.name,'Locked')" :rowData="mainData" @onSuccess="queryMainData"/>
+        <Del 
+          :id="mainData.sa_projectid" 
+          :nameId="20221020144302" 
+          nameKey="sa_projectids" 
+          class="inline-16"
+          v-if="tool.checkAuth($route.name,'delete')"
+          @deleteSuccess="deleteSuccess"
+        />
         <el-button size="mini" slot="reference" icon="el-icon-more"></el-button>
       </el-popover>
     </div>
@@ -64,9 +72,10 @@ import StageTask from './modules/stageTask/index'
 import putPeople from '../components/putPeople'
 import Check from '../components/check'
 import Locked from '../components/Locked'
+import Del from '../components/del'
 import andEnterprise from './modules/andEnterprise/index'
 export default {
-  components:{Quotation,ProjectSet,Rival,BaseInfo,StageTask,putPeople,Check,Locked,andEnterprise},
+  components:{Quotation,ProjectSet,Rival,BaseInfo,StageTask,putPeople,Check,Locked,andEnterprise,Del},
   data () {
     return {
       mainData:'',
@@ -95,6 +104,10 @@ export default {
     }
   },
   methods:{
+    deleteSuccess(){
+      this.queryMainData(this.$route.query.id)
+      this.$emit('onSuccess')
+    },
     async queryMainData (id) {
       const res = await this.$api.requested({
         "id": "20221021103902",

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -46,15 +46,9 @@
             {{scope.data.column.data[[scope.data.column.columnname]]}}
           </div>
         </template>
-<<<<<<< HEAD
-        <!-- <template v-slot:tbOpreation="scope">
-          <el-button size="mini" type="text" @click="$router.push({path:'/customerDetail',query:{id:scope.data.data.sa_customersid,rowindex:scope.data.data.rowindex,tabIndex:tabIndex}})">详 情</el-button>
-        </template> -->
-=======
 <!--        <template v-slot:tbOpreation="scope">-->
 <!--          <el-button size="mini" type="text" @click="$router.push({path:'/customerDetail',query:{id:scope.data.data.sa_customersid,rowindex:scope.data.data.rowindex,tabIndex:tabIndex}})">详 情</el-button>-->
 <!--        </template>-->
->>>>>>> 8be118da8263bf7cea1e45cdd92c84cc2cd45a40
       </basicLayout>
   </div>
 </template>

src/components/delete_btn/index.vue

@@ -1,7 +1,8 @@
 <template>
-  <div class="inline-16">
+  <div class="inline-16" :style="type=='detail'?'width:100%' : ''">
     <el-popconfirm title="确定删除当前产品吗？" @confirm="deleteRow()">
-      <el-button slot="reference" size="small" type="text">删 除</el-button>
+      <el-button slot="reference" size="mini" v-if="type=='detail'" style="width:100%">删 除</el-button>
+      <el-button slot="reference" size="mini" type="text" v-else>删 除</el-button>
     </el-popconfirm>
   </div>
 </template>
@@ -13,7 +14,7 @@ nameId:接口id
 nameKey:接口字段
  */
 export default {
-  props: ['id','nameId','nameKey'],
+  props: ['id','nameId','nameKey','type'],
   data () {
     return {
       param: {

src/router/HDrpManagement.js

@@ -198,16 +198,19 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/index')
-  },{
-    path: '/projectChangeDetail',
-    name:'project',
-    meta: {
-      title: '项目商机详情',
-      ast_nav: true,
-      keeproute: true,
-    },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/modules/detail')
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/index'),
+    children:[
+      {
+        path: '/projectChangeDetail',
+        name: 'project',
+        meta: {
+          title: '项目商机详情',
+          ast_nav:true,
+          keeproute: true
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/projectChange/modules/detail')
+      }
+    ]
   },{
     path: '/quotationDetail',
     name:'project',
@@ -234,7 +237,19 @@ const HDrpManagement = [
       ast_nav: true,
       keeproute: true,
     },
-    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/productMoneyOdd/index')
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/productMoneyOdd/index'),
+    children:[
+      {
+        path: '/productMoneyOddDetail',
+        name: 'productMoneyOdd',
+        meta: {
+          title: '商品调整单详情',
+          ast_nav:true,
+          keeproute: true
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/productMoneyOdd/modules/detail')
+      }
+    ]
   }
   
 ];