暂存

src/HDrpManagement/contractManage/modules/detail.vue

@@ -8,7 +8,7 @@
         turnPageId="20221121201502"
         idname="sa_contractid"
         ownertable="sa_contract"
-        :tabs="mainData.type === '项目' ? ['产品清单','产品类别折扣','详细信息'] : mainData.type === '框架' ? ['产品明细折扣','产品类别折扣','业绩目标','详细信息'] : mainData.type === '居间' ? ['详细信息'] : ['工具清单','合同条款','详细信息']"
+        :tabs="mainData.type === '项目' ? ['产品清单','产品类别折扣','详细信息'] : mainData.type === '框架' ? ['产品明细折扣','产品类别折扣','业绩目标','详细信息'] : mainData.type === '居间' ? ['详细信息'] : ['工具清单','详细信息']"
 
         :statusCheck="[{key:'status',value:'已提交'},{key:'status',value:'审核'},{key:'status',value:'已终止'}]"
         @pageChange="pageChange"
@@ -98,8 +98,9 @@
         <!--    产品类别折扣    -->
         <itemClass :data="mainData" v-if="mainData.type == '项目'" :isLeader="isLeader" ></itemClass>
         <!--合同条款-->
-        <contractClause :sys_enterpriseid="mainData.sys_enterpriseid" :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if=" mainData.type == '工具借用'">
-        </contractClause>
+<!--        <contractClause :sys_enterpriseid="mainData.sys_enterpriseid" :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if=" mainData.type == '工具借用'">
+        </contractClause>-->
+        <BaseInfo v-if="mainData.type === '工具借用'" :detailInfo="detailInfo"/>
       </div>
       <div slot="slot2">
         <!--合同条款-->

src/HDrpManagement/orderManage/details/index.vue

@@ -228,10 +228,10 @@ export default {
           label:'备注',
           value:this.mainData.remarks
         },
-        {
+        /*{
           label:'返利金使用比例(%)',
           value:this.mainData.rebate_userate
-        },
+        },*/
         {
           label:'退回原因',
           value:this.mainData.backreason

src/HDrpManagement/projectChange/components/duplicateCheck.vue

@@ -49,7 +49,7 @@ export default {
     async listData(){
       this.param.content.projectname = this.data.projectname
       this.param.content.address = this.data.address
-      this.param.content.sa_projectid = this.data.sa_projectid
+      this.param.content.sa_projectid = this.data.sa_projectid || 0
       const res = await this.$api.requested(this.param)
       console.log(res,"查重结果")
       if (res.data.length > 0){
@@ -63,6 +63,7 @@ export default {
           type: 'success'
         });
       }
+      this.$emit('checkSuccess',res.data.length)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add copy.vue

@@ -0,0 +1,209 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="onshow">新 建</el-button>
+    <el-drawer
+        title="新建关联客户"
+        :visible.sync="visible"
+        size="800px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+            <el-col :span="24">
+                  <el-input
+                      style="width:300px;margin-bottom: 10px"
+                      placeholder="请输入内容"
+                      v-model="customerParam.content.where.condition"
+                      clearable
+                      @clear="customerList(customerParam.content.pageNumber = 1)"
+                      size="mini"
+                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                  </el-input>
+                  <el-table :data="customer.customerData" @row-click="customerData" height="802px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+                    <el-table-column
+                        label="客户编号"
+                        width="180">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="客户名称"
+                        width="200">
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="地址"
+                    >
+                      <template slot-scope="scope">
+                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                  <div class="container normal-panel" style="text-align:right">
+                    <el-pagination
+                        background
+                        small
+                        @size-change="handleSizeChangeCustomer"
+                        @current-change="handleCurrentChangeCustomer"
+                        :page-sizes="[10,20,50,100,]"
+                        layout="total,sizes, prev, pager, next, jumper"
+                        :current-page="customer.currentPage"
+                        :total="customer.total">
+                    </el-pagination>
+                  </div>
+<!--                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>-->
+            </el-col>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+    <enterprise
+        :visible="visibleEnterprise"
+        :index="index"
+        :sa_projectid="form.sa_projectid"
+        v-if="visibleEnterprise"
+        @onEnterprise="onEnterprise">
+    </enterprise>
+  </div>
+</template>
+
+<script>
+import enterprise from './enterprise'
+export default {
+  name: "add",
+  props:["data"],
+  // inject:["enterpriseType"],
+  components:{enterprise},
+  data(){
+    return {
+      visible:false,
+      visibleEnterprise:false,
+      customerShow:false,
+      customertype:'',
+      index:'',
+      form:{
+        sa_project_partiesid: 0,
+        sa_projectid: '',
+        sys_enterpriseid:'',
+        enterprisename:'',
+        remarks:""
+      },
+      rules:{
+        enterprisename:[
+          { required: true, message: '请选择企业', trigger: 'change'},
+        ],
+      },
+      customerParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "type":5,
+            "sa_projectid":""
+          }
+        }
+      },
+      customer:{
+        customerData:[],
+        total:0,
+        currentPage:0,
+      },
+    }
+  },
+  methods:{
+    onshow(){
+      console.log("新增企业缔约信息")
+      console.log(this.data)
+      this.visible = true
+      console.log(this.enterpriseTypeList,'客户类型')
+      this.selectCustomer()
+    },
+    async onSubmit(){
+      this.form.sa_projectid = this.$route.query.id
+      const res = await this.$api.requested({
+        "id": 20221027143602,
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('addSuccess')
+        this.onClose()
+      })
+    },
+    onClose(){
+      this.visible = false
+      this.form={
+        sa_project_partiesid: 0,
+        sa_projectid: '',
+        sys_enterpriseid:'',
+        enterprisename:'',
+        remarks:""
+      }
+    },
+    enterpriseList(){
+      this.visibleEnterprise = true
+    },
+    /*客户列表*/
+    onEnterprise(data){
+      this.visibleEnterprise = false
+      console.log("企业信息",data)
+      this.form.sys_enterpriseid = data.sys_enterpriseid
+      this.form.enterprisename = data.enterprisename
+    },
+    async customerList(){
+      this.customerParam.content.where.sa_projectid = this.$route.query.id
+      const res = await this.$api.requested(this.customerParam)
+      this.customer.customerData = res.data
+      this.customer.total = res.total
+      this.customer.currentPage = res.pageNumber
+    },
+    selectCustomer(){
+      this.customerParam.content.where.condition = this.form.enterprisename
+      this.customerList()
+    },
+    /*客户选择信息*/
+    customerData(val){
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.onSubmit()
+    },
+    /*客户分页*/
+    handleSizeChangeCustomer(val) {
+      // console.log(`每页 ${val} 条`);
+      this.customerParam.content.pageSize = val
+      this.customerList()
+    },
+    handleCurrentChangeCustomer(val) {
+      // console.log(`当前页: ${val}`);
+      this.customerParam.content.pageNumber = val
+      this.customerList()
+    },
+
+  },
+  mounted() {
+    this.selectCustomer()
+  }
+}
+</script>
+
+<style scoped>
+>>> .el-divider--horizontal {
+  height: 1px;
+  width: 100%;
+  margin: 0px;
+}
+/deep/.el-input__prefix {
+  display: flex;
+  align-items: center;
+}
+</style>

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -10,60 +10,117 @@
         :show-close="false"
         @close="onClose">
       <div class="drawer__panel">
-        <el-row :gutter="20">
-            <el-col :span="24">
-                  <el-input
-                      style="width:300px;margin-bottom: 10px"
-                      placeholder="请输入内容"
-                      v-model="customerParam.content.where.condition"
-                      clearable
-                      @clear="customerList(customerParam.content.pageNumber = 1)"
-                      size="mini"
-                      @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
-                    <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
-                  </el-input>
-                  <el-table :data="customer.customerData" @row-click="customerData" height="802px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
-                    <el-table-column
-                        label="客户编号"
-                        width="180">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="客户名称"
-                        width="200">
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column
-                        label="地址"
-                    >
-                      <template slot-scope="scope">
-                        <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                  <div class="container normal-panel" style="text-align:right">
-                    <el-pagination
-                        background
-                        small
-                        @size-change="handleSizeChangeCustomer"
-                        @current-change="handleCurrentChangeCustomer"
-                        :page-sizes="[10,20,50,100,]"
-                        layout="total,sizes, prev, pager, next, jumper"
-                        :current-page="customer.currentPage"
-                        :total="customer.total">
-                    </el-pagination>
-                  </div>
-<!--                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>-->
-            </el-col>
-        </el-row>
+        <el-tabs type="border-card">
+          <el-tab-pane label="客户">
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-input
+                    style="width:300px;margin-bottom: 10px"
+                    placeholder="请输入内容"
+                    v-model="customerParam.content.where.condition"
+                    clearable
+                    @clear="customerList(customerParam.content.pageNumber = 1)"
+                    size="mini"
+                    @keyup.enter.native="customerList(customerParam.content.pageNumber = 1)">
+                  <i slot="prefix" class="el-icon-search" @click="customerList(customerParam.content.pageNumber = 1)"></i>
+                </el-input>
+                <el-table :data="customer.customerData" @row-click="customerData" height="802px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+<!--                  <el-table-column
+                      label="客户编号"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'&#45;&#45;' }}</span>
+                    </template>
+                  </el-table-column>-->
+                  <el-table-column
+                      label="客户名称"
+                      width="260">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="地址"
+                  >
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container normal-panel" style="text-align:right">
+                  <el-pagination
+                      background
+                      small
+                      @size-change="handleSizeChangeCustomer"
+                      @current-change="handleCurrentChangeCustomer"
+                      :page-sizes="[10,20,50,100,]"
+                      layout="total,sizes, prev, pager, next, jumper"
+                      :current-page="customer.currentPage"
+                      :total="customer.total">
+                  </el-pagination>
+                </div>
+                <!--                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>-->
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="经销商">
+            <el-row :gutter="20">
+              <el-col :span="24">
+                <el-input
+                    style="width:300px;margin-bottom: 10px"
+                    placeholder="请输入内容"
+                    v-model="distributorParam.content.where.condition"
+                    clearable
+                    @clear="distributorList(distributorParam.content.pageNumber = 1)"
+                    size="mini"
+                    @keyup.enter.native="distributorList(distributorParam.content.pageNumber = 1)">
+                  <i slot="prefix" class="el-icon-search" @click="distributorList(distributorParam.content.pageNumber = 1)"></i>
+                </el-input>
+                <el-table :data="distributor.distributorData" @row-click="distributorData" height="802px" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
+<!--                  <el-table-column
+                      label="客户编号"
+                      width="180">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.sa_customersid?scope.row.sa_customersid:'&#45;&#45;' }}</span>
+                    </template>
+                  </el-table-column>-->
+                  <el-table-column
+                      label="经销商名称"
+                      width="260">
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                      label="地址"
+                  >
+                    <template slot-scope="scope">
+                      <span style="margin-left: 10px">{{ scope.row.address?scope.row.address:'--' }}</span>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container normal-panel" style="text-align:right">
+                  <el-pagination
+                      background
+                      small
+                      @size-change="handleSizeChangeDistributor"
+                      @current-change="handleCurrentChangeDistributor"
+                      :page-sizes="[10,20,50,100,]"
+                      layout="total,sizes, prev, pager, next, jumper"
+                      :current-page="distributor.currentPage"
+                      :total="distributor.total">
+                  </el-pagination>
+                </div>
+                <!--                  <el-input slot="reference" :readonly="true" v-model="form.enterprisename" autocomplete="off" placeholder="请选择客户"  @input="selectCustomer"></el-input>-->
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+        </el-tabs>
+
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+<!--        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>-->
       </div>
     </el-drawer>
     <enterprise
@@ -109,7 +166,19 @@ export default {
           "pageSize": 20,
           "where": {
             "condition": "",
-            "type":5,
+            "type":6,
+            "sa_projectid":""
+          }
+        }
+      },
+      distributorParam:{
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": "",
+            "type":8,
             "sa_projectid":""
           }
         }
@@ -119,6 +188,11 @@ export default {
         total:0,
         currentPage:0,
       },
+      distributor:{
+        distributorData:[],
+        total:0,
+        currentPage:0,
+      }
     }
   },
   methods:{
@@ -140,6 +214,30 @@ export default {
         this.onClose()
       })
     },
+    async addDistributor(){
+      this.form.sa_projectid = this.$route.query.id
+      const res = await this.$api.requested({
+        "id": 20221027143602,
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.setType(res.data.sa_project_partiesid)
+      })
+    },
+    async setType(id){
+      const res = await this.$api.requested({
+        "id": 20221116142502,
+        "content":{
+          "sa_projectid":this.$route.query.id,
+          "sa_project_partiesid": id,
+          "type": "经销商"
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit('addSuccess')
+        this.onClose()
+      })
+    },
     onClose(){
       this.visible = false
       this.form={
@@ -167,10 +265,10 @@ export default {
       this.customer.total = res.total
       this.customer.currentPage = res.pageNumber
     },
-    selectCustomer(){
+    /*selectCustomer(){
       this.customerParam.content.where.condition = this.form.enterprisename
       this.customerList()
-    },
+    },*/
     /*客户选择信息*/
     customerData(val){
       this.form.sys_enterpriseid = val.sys_enterpriseid
@@ -188,10 +286,34 @@ export default {
       this.customerParam.content.pageNumber = val
       this.customerList()
     },
+    async distributorList(){
+      this.distributorParam.content.where.sa_projectid = this.$route.query.id
+      const res = await this.$api.requested(this.distributorParam)
+      this.distributor.distributorData = res.data
+      this.distributor.total = res.total
+      this.distributor.currentPage = res.pageNumber
+    },
+    distributorData(val){
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.addDistributor()
+    },
+    /*经销商分页*/
+    handleSizeChangeDistributor(val) {
+      // console.log(`每页 ${val} 条`);
+      this.customerParam.content.pageSize = val
+      this.distributorList()
+    },
+    handleCurrentChangeDistributor(val) {
+      // console.log(`当前页: ${val}`);
+      this.customerParam.content.pageNumber = val
+      this.distributorList()
+    },
 
   },
   mounted() {
-    this.selectCustomer()
+    this.customerList()
+    this.distributorList()
   }
 }
 </script>

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -85,7 +85,16 @@
             <el-col :span="24">
               <el-form-item label="发布范围" prop="roles">
                 <el-select style="width:100%" v-model="form.roles" placeholder="请选择角色" multiple>
-                  <el-option v-for="item in rolelist" :key="item.roleid" :label="item.rolename" :value="item.roleid"></el-option>
+<!--                  <el-option v-for="item in rolelist" :key="item.roleid" :label="item.rolename" :value="item.roleid"></el-option>-->
+                  <el-option
+                      v-for="item in rolelist"
+                      :key="item.roleid"
+                      :label="item.rolename"
+                      :value="item.roleid"
+                  >
+                    <span style="float: left">{{ item.rolename }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
                 </el-select>
               </el-form-item>
             </el-col>

src/HManagement/salesForecastTemplate/modules/edit.vue

@@ -77,7 +77,15 @@
             <el-col :span="24">
               <el-form-item label="发布范围" prop="roles">
                 <el-select style="width:100%" v-model="form.roles" placeholder="请选择角色" multiple>
-                  <el-option v-for="item in rolelist" :key="item.roleid" :label="item.rolename" :value="item.roleid"></el-option>
+                  <el-option
+                      v-for="item in rolelist"
+                      :key="item.roleid"
+                      :label="item.rolename"
+                      :value="item.roleid"
+                  >
+                    <span style="float: left">{{ item.rolename }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -227,7 +235,7 @@ export default {
           "where":{
             "condition":"",
             "usertype":"",
-            "issystem":1
+            "issystem":""
           }
         }
       })

src/SDrpManagement/QuotedPrice/detail/modules/itemClass/index.vue

@@ -57,15 +57,15 @@
             label="操作"
             width="120">
           <template slot-scope="scope">
-            <el-button  size="mini" type="text" class="inline-16" @click="onEdit(scope.row)" v-if="!saveShow" :disabled="!tool.checkAuth($route.name,'itemClassDetails') || data.status !== '新建' || !disabled">编 辑</el-button>
+            <el-button  size="mini" type="text" class="inline-16" @click="onEdit(scope.row)" v-if="index !== scope.row.rowindex" :disabled="!tool.checkAuth($route.name,'itemClassDetails') || data.status !== '新建' || !disabled">编 辑</el-button>
             <el-popconfirm
                 title="确定删除该产品类别吗?"
                 @confirm="deleteProduct(scope.row)"
             >
-              <el-button class="inline-16" slot="reference" size="mini" type="text" v-if="!saveShow" :disabled="!tool.checkAuth($route.name,'itemClassDetails') || data.status !== '新建' || !disabled">删 除</el-button>
+              <el-button class="inline-16" slot="reference" size="mini" type="text" v-if="index !== scope.row.rowindex" :disabled="!tool.checkAuth($route.name,'itemClassDetails') || data.status !== '新建' || !disabled">删 除</el-button>
             </el-popconfirm>
-            <el-button  size="mini" type="text" class="inline-16" @click="onSave(scope.row)" v-if="saveShow">保 存</el-button>
-            <el-button  size="mini" type="text" class="inline-16" @click="onCancel" v-if="saveShow">取 消</el-button>
+            <el-button  size="mini" type="text" class="inline-16" @click="onSave(scope.row)" v-if="saveShow && index === scope.row.rowindex">保 存</el-button>
+            <el-button  size="mini" type="text" class="inline-16" @click="onCancel" v-if="saveShow && index === scope.row.rowindex">取 消</el-button>
           </template>
         </el-table-column>
       </el-table>

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -117,7 +117,7 @@
             fixed="right">
           <template slot-scope="scope">
             <span>
-              <el-input-number :disabled="!saveShow || index !== scope.row.rowIndex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
+              <el-input-number :disabled="!saveShow || index !== scope.row.rowindex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
             </span>
           </template>
         </el-table-column>
@@ -136,10 +136,10 @@
             width="80"
             fixed="right">
           <template slot-scope="scope">
-            <div v-if="(scope.row.discountDifferenceAmount > 0 && !saveShow) || index !== scope.row.rowIndex">
+            <div v-if="(scope.row.discountDifferenceAmount > 0 && !saveShow) || index !== scope.row.rowindex">
               <p><span :style="[setTopColor]">{{scope.row.discountrate}}</span></p>
             </div>
-            <div v-else-if="(scope.row.discountDifferenceAmount < 0 && !saveShow) || index !== scope.row.rowIndex">
+            <div v-else-if="(scope.row.discountDifferenceAmount < 0 && !saveShow) || index !== scope.row.rowindex">
               <p><span :style="[setDownColor]">{{scope.row.discountrate}}</span></p>
             </div>
             <span v-else>
@@ -162,10 +162,10 @@
             width="80"
             fixed="right">
           <template slot-scope="scope">
-            <div v-if="(scope.row.discountDifferenceAmount > 0 && !saveShow) || index !== scope.row.rowIndex">
+            <div v-if="(scope.row.discountDifferenceAmount > 0 && !saveShow) || index !== scope.row.rowindex">
               <p><span :style="[setTopColor]">{{scope.row.price}}</span></p>
             </div>
-            <div v-else-if="(scope.row.discountDifferenceAmount < 0 && !saveShow) || index !== scope.row.rowIndex" >
+            <div v-else-if="(scope.row.discountDifferenceAmount < 0 && !saveShow) || index !== scope.row.rowindex" >
               <p><span :style="[setDownColor]">{{scope.row.price}}</span></p>
             </div>
             <span v-else>
@@ -207,15 +207,15 @@
             label="操作"
             width="120">
           <template slot-scope="scope">
-            <el-button  size="mini" type="text" class="inline-16" @click="onEdit(scope.row)" v-if="!saveShow" :disabled="!tool.checkAuth($route.name,'productDetails') || data.status !== '新建' || !disabled">编 辑</el-button>
+            <el-button  size="mini" type="text" class="inline-16" @click="onEdit(scope.row)" v-if="index !== scope.row.rowindex" :disabled="!tool.checkAuth($route.name,'productDetails') || data.status !== '新建' || !disabled">编 辑</el-button>
             <el-popconfirm
                 title="确定删除该产品吗?"
                 @confirm="deleteProduct(scope.row)"
             >
-              <el-button class="inline-16" slot="reference" size="mini" type="text" v-if="!saveShow" :disabled="!tool.checkAuth($route.name,'productDetails') || data.status !== '新建' || !disabled">删 除</el-button>
+              <el-button class="inline-16" slot="reference" size="mini" type="text" v-if="index !== scope.row.rowindex" :disabled="!tool.checkAuth($route.name,'productDetails') || data.status !== '新建' || !disabled" @click="deleteProduct(scope.row)">删 除</el-button>
             </el-popconfirm>
-            <el-button  size="mini" type="text" class="inline-16" @click="onSave(scope.row)" v-if="saveShow">保 存</el-button>
-            <el-button  size="mini" type="text" class="inline-16" @click="saveShow = false;index = ''" v-if="saveShow">取 消</el-button>
+            <el-button  size="mini" type="text" class="inline-16" @click="onSave(scope.row)" v-if="saveShow && index === scope.row.rowindex">保 存</el-button>
+            <el-button  size="mini" type="text" class="inline-16" @click="saveShow = false;index = '';productData()" v-if="saveShow && index === scope.row.rowindex">取 消</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -329,6 +329,7 @@ export default {
       this.$refs.quoterPrice.queryProduct(id,type)
     },
     async deleteProduct(val){
+      console.log(val)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "content": {
@@ -400,7 +401,7 @@ export default {
     onEdit(row){
       console.log(row,'进行编辑')
       this.saveShow = true
-      this.index = row.rowIndex
+      this.index = row.rowindex
     },
     async onSave(row){
       console.log(row,'进行保存')
@@ -416,6 +417,7 @@ export default {
         this.saveShow = false
         this.index = ''
         this.productData()
+
       })
     }
   },

src/SDrpManagement/agentOrder/index.vue

@@ -28,7 +28,7 @@
           <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择订单类型" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.type = type;$refs.basicLayout.listData()">
             <el-option value="标准订单" label="标准订单"></el-option>
             <el-option value="项目订单" label="项目订单"></el-option>
-            <el-option value="促销订单" label="促销订单"></el-option>
+<!--            <el-option value="促销订单" label="促销订单"></el-option>-->
             <el-option value="工具订单" label="工具订单"></el-option>
           </el-select>
         </div>

src/SDrpManagement/salerOrder/index.vue

@@ -28,7 +28,7 @@
           <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.type = type;$refs.basicLayout.listData()">
             <el-option value="标准订单" label="标准订单"></el-option>
             <el-option value="项目订单" label="项目订单"></el-option>
-            <el-option value="促销订单" label="促销订单"></el-option>
+<!--            <el-option value="促销订单" label="促销订单"></el-option>-->
             <el-option value="工具订单" label="工具订单"></el-option>
           </el-select>
         </div>

src/SDrpManagement/salerOrder/modules/add.vue

@@ -4,9 +4,9 @@
       新 建
       <el-dropdown-menu slot="dropdown">
         <el-dropdown-item command="标准订单">标准订单</el-dropdown-item>
-        <el-dropdown-item command="特殊订单">特殊订单</el-dropdown-item>
+<!--        <el-dropdown-item command="特殊订单">特殊订单</el-dropdown-item>-->
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
-        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
+<!--        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>-->
         <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -209,7 +209,7 @@ export default {
         this.tool.showMessage(res,()=>{
           this.drawer = false
           this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+          this.$router.push({path:'/saler_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })
       })
     },

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -149,7 +149,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button  size="small" @click="onClose" class="normal-btn-width inline-16">取 消</el-button>
-        <duplicateCheck :data="form"></duplicateCheck>
+        <duplicateCheck :data="form" @checkSuccess="checkSuccess"></duplicateCheck>
         <el-button size="small" type="primary" @click="onSave" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -302,11 +302,16 @@ export default {
         if (res.data.length !== 0){
           console.log("重复")
         }
-        this.checkResults = res.data.length
+        this.checkResults = res.data.total
+        console.log(this.checkResults)
         this.onSave()
       })
     },
+    checkSuccess(val){
+      this.checkResults = val
+    },
     onSave(){
+      console.log(this.checkResults)
       if (this.checkResults === ''){
         this.duplicateCheck()
       }else {