代码更新

src/Form/QuotedPrice/edit.vue

@@ -265,7 +265,7 @@
               </el-form-item>
             </el-col>
             <el-col  :span="24">
-              <el-form-item label="折扣:" label-width="100px" prop="discountrate">
+              <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
                 <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>

src/Form/projectChange/add.vue

@@ -25,6 +25,8 @@
                       :key="index"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -37,6 +39,8 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/projectChange/edit.vue

@@ -25,6 +25,8 @@
                       :key="index"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -37,6 +39,8 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/publicCustomer/add.vue

@@ -78,8 +78,10 @@
                     :key="item.value"
                     :label="item.value"
                     :value="item.value">
+<!--                    <span style="float: left">{{ item.value }}</span>
+                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>-->
                     <span style="float: left">{{ item.value }}</span>
-                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -93,6 +95,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -105,6 +109,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/publicCustomer/edit.vue

@@ -78,6 +78,8 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -90,6 +92,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -102,6 +106,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/salerPrivatecustomer/add.vue

@@ -66,8 +66,10 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+<!--                    <span style="float: left">{{ item.value }}</span>
+                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>-->
                     <span style="float: left">{{ item.value }}</span>
-                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -80,6 +82,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -92,6 +96,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/Form/salerPrivatecustomer/edit.vue

@@ -77,6 +77,8 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -89,6 +91,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -101,6 +105,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/HDrpManagement/contractManage/components/itemClass/add.vue

@@ -81,7 +81,7 @@
             <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="类别名称" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
           </div>
           <div style="margin-top:-10px;margin-bottom: 10px;float: right">
-            <el-button style="float: right" type="primary" size="mini" @click="batchSelect" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+            <el-button style="float: right" type="primary" size="mini" @click="itemClassSelect" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
           </div>
         </div>
         <div class="produtMag-panel">
@@ -124,7 +124,7 @@
                 label="折扣"
                 width="0">
               <template slot-scope="scope">
-                <span>{{Math.round((scope.row.discountrate * 100)*100)/100}}</span>
+                <span>{{Math.round(scope.row.discountrate*100)/100}}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -132,7 +132,7 @@
                 label="操作"
                 width="80">
               <template slot-scope="scope">
-                <el-button type="text" @click="onSelect(scope.row)">添 加</el-button>
+                <el-button type="text" @click="itemClass(scope.row)">添 加</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -226,6 +226,24 @@ export default {
         that.timer = setTimeout(fn, wait)
       }
     },
+    async itemClassSelect(){
+      let checkItem = []
+      this.selectData.forEach((item,index)=>{
+        checkItem[index] = item.itemclassid
+      })
+      const res = await this.$api.requested({
+        "id": 20230223201103,
+        "content": {
+          "sa_contractid": this.$route.query.id,
+          "itemclassids":checkItem
+        },
+      })
+      if (!res.data){
+        this.batchSelect()
+      }else {
+        this.checkItems()
+      }
+    },
     batchSelect(){
       this.debounce(this.onSubmit,300)()
     },
@@ -244,6 +262,24 @@ export default {
       })
 
     },
+
+    async itemClass(data){
+      const res = await this.$api.requested({
+        "id": 20230223201103,
+        "content": {
+          "sa_contractid": this.$route.query.id,
+          "itemclassids":[data.itemclassid]
+        },
+      })
+      console.log(res,'是否重复')
+      if (!res.data){
+        console.log(data,'不重复的数据')
+        this.onSelect(data)
+      }else {
+        this.checkItem(data)
+      }
+    },
+
     onSelect(val){
       console.log(val,"选择的商品")
       this.tableSelectData = []
@@ -252,7 +288,7 @@ export default {
         return {
           "sa_contract_itemsaleclassid":0,
           "itemclassid":e.itemclassid,
-          "discountrate":e.discountrate
+          "discountrate":e.discountrate /100
         }
       })
       this.selectData = obj
@@ -279,7 +315,7 @@ export default {
         return {
           "sa_contract_itemsaleclassid":0,
           "itemclassid":e.itemclassid,
-          "discountrate":e.discountrate
+          "discountrate":e.discountrate / 100
         }
       })
       this.selectData = obj
@@ -321,7 +357,37 @@ export default {
       this.params.content.sa_quotedpriceid = row.sa_quotedpriceid
       this.listData()
       this.selectListData()
-    }
+    },
+    checkItems() {
+      this.$confirm('类别已存在, 是否更新最新折扣?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal:false,
+        type: 'warning'
+      }).then(() => {
+        this.batchSelect()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消添加'
+        });
+      });
+    },
+    checkItem(data) {
+      this.$confirm('类别已存在, 是否更新最新折扣?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal:false,
+        type: 'warning'
+      }).then(() => {
+        this.onSelect(data)
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消添加'
+        });
+      });
+    },
   },
   mounted() {
   }

src/HDrpManagement/contractManage/components/itemClass/index.vue

@@ -57,15 +57,16 @@
             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,'productClassManage') || data.status !== '新建' || !isLeader">编 辑</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,'productClassManage') || data.status !== '新建' || !isLeader">编 辑</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-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,'productClassManage') || data.status !== '新建' || !isLeader">删 除</el-button>
+              <el-button class="inline-16" slot="reference" size="mini" type="text"  :disabled="!tool.checkAuth($route.name,'productClassManage') || data.status !== '新建' || !isLeader">删 除</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="onCancel" v-if="saveShow">取 消</el-button>-->
           </template>
         </el-table-column>
       </el-table>

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -225,18 +225,18 @@ export default {
         this.$emit('onSuccess')
       })
     },
-    batchSelects(){
+    batchSelects(data){
       this.debounce(() => {
-        this.onSumit()
+        this.onSumit(data)
       },300)()
     },
-    async onSumit () {
+    async onSumit (data) {
       console.log(this.$refs.table.tableSelectData);
       let res = await this.$api.requested({
         "id": 20221123164402,
         "content": {
             "sa_contractid": this.$route.query.id,
-            "items": item
+            "items": data
         },
       })
       this.tool.showMessage(res,() => {

src/HDrpManagement/contractManage/index.vue

@@ -187,6 +187,7 @@ export default {
       
       const res2 = await this.$store.dispatch('optiontypeselect','contracttype')
       this.typeList = res2.data
+      console.log(res2.data,'项目类型')
     },
     async getAgentList () {
       let res = await this.$api.requested({

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"
@@ -24,7 +24,7 @@
         <Del class="inline-16" :idName="20221121202502" :id="mainData.sa_contractid" idKey="sa_contractids"  v-if="tool.checkAuth($route.name,'toVoid') && (mainData.status == '新建' || mainData.status == '已终止') && isLeader"/>
       </div>
       <div slot="slot0" >
-        <!--产品清单表-->
+        <!--项目产品明细折扣表-->
         <productBillno ref="billno" @priceChange="queryMainData" v-if="mainData.type == '项目'">
           <addProduct ref="addProduct" :data="mainData" v-if="tool.checkAuth($route.name,'productBillManage')" :disabled="mainData.status != '新建' || !isLeader" slot="addProduct" @onSuccess="$refs.billno.listData()"/>
           <template v-slot:edit="scope">

src/HDrpManagement/projectChange/modules/detail.vue

@@ -186,7 +186,11 @@ export default {
       })
 
       this.mainData = res.data
-      this.mainData.discountrate = Math.round((this.mainData.discountrate * 100) * 100)/100
+      if (this.mainData.discountrate > 1){
+        this.mainData.discountrate = Math.round(this.mainData.discountrate)
+      }else {
+        this.mainData.discountrate = Math.round((this.mainData.discountrate * 100) * 100)/100
+      }
       console.log(this.mainData,"项目商机详情");
       
       /* 获取标签数据 */

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -367,7 +367,7 @@ export default {
         this.data.discountrate = Math.round(val * 100)/100
       }
       console.log(this.data,"修改预计折扣")
-      this.data.discountrate = this.data.discountrate / 100
+      this.data.discountrate = (this.data.discountrate / 100).toFixed(3)
       const res = await this.$api.requested({
         "id": 20230207090702,
         "content": {
@@ -377,7 +377,12 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.listData()
-        this.data.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100
+        if (this.mainData.discountrate > 1){
+          this.data.discountrate = Math.round((this.data.discountrate) * 100) / 100
+        }else {
+          this.data.discountrate = Math.round((this.data.discountrate * 100) * 100) / 100
+        }
+
         this.$emit("productSetSuccess")
       })
     }

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -265,7 +265,7 @@
               </el-form-item>
             </el-col>
             <el-col  :span="24">
-              <el-form-item label="折扣:" label-width="100px" prop="discountrate">
+              <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
                 <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
@@ -443,6 +443,7 @@ export default {
       console.log(this.form,"form")
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
+        this.form.discountrate = (this.form.discountrate /100).toFixed(3)
         const res = await this.$api.requested({
           "id": 20221020164803,
           "content": this.form

src/HDrpManagement/projectChange/modules/modules/stageTask/index.vue

@@ -14,12 +14,26 @@
       <el-table-column
           prop="taskname"
           label="工作任务"
+          width="230"
           >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.important === 1" size="mini" class="inline-16">关键</el-tag>
           <span>{{scope.row.taskname}}</span>
         </template>
       </el-table-column>
+      <el-table-column
+          label="关联客户对象"
+         >
+        <template slot-scope="scope">
+          <span v-if="scope.row.onparties === 1">
+            <span v-for="item in scope.row.partiestype">
+               <el-tag style="margin-top: 2px;margin-bottom: 2px"  size="mini" class="inline-16">{{item}}</el-tag>
+            </span>
+
+          </span>
+          <span v-else>--</span>
+        </template>
+      </el-table-column>
       <el-table-column
           prop="score"
           label="分值"

src/HManagement/marketing2/agent/details/index.vue

@@ -291,7 +291,7 @@ export default {
     // 获取表结构
     this.tablecols = this.tool.tabelCol(this.$route.name)['agentGrouptable'].tablecols
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    /*this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)*/
   },
 }
 

src/HManagement/task/modules/completeTask.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-show="data.leader && data.leader[0] && nowUserid === data.leader[0].userid" :disabled="data.status !== '进行中'" class="inline-16" type="primary" size="mini" @click="dialogFormVisible = true" >完成任务</el-button>
+    <el-button v-show="data.leader && data.leader[0] && nowUserid === data.leader[0].userid" :disabled="data.status !== '进行中' || data.status !== '待执行'" class="inline-16" type="primary" size="mini" @click="dialogFormVisible = true" >完成任务</el-button>
     <el-dialog title="完成任务" :visible.sync="dialogFormVisible" append-to-body width="500px">
       <el-form :model="form" label-position="top" label-width="90px">
         <el-form-item label="完成说明">

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -52,7 +52,7 @@
         </div>
       </div>-->
       
-      <el-button class="normal-margin" type="primary" style="width:200px" icon="el-icon-shopping-cart-full" @click="addCart">加入购物车</el-button>
+      <el-button class="normal-margin" type="primary" style="width:200px" icon="el-icon-shopping-cart-full" @click="addCart"  :disabled="usertype === 0 || usertype === 1">加入购物车</el-button>
       <div style="display:flex">
         <p>相关链接:&emsp;</p>
         <div>
@@ -76,7 +76,8 @@ export default {
       selectProduct: '',
       actImage:{},
       tradefield:[],
-      actTradefield:''
+      actTradefield:'',
+      usertype:""
     };
   },
   computed: {
@@ -86,11 +87,13 @@ export default {
   created () {
     this.getDetail()
   },
+  mounted() {
+    this.usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
+  },
   methods: {
     async getDetail () {
       let res = await this.$api.requested({
         "id": "20220926142403",
-        "version": 1,
         "content": {
           "sa_itemgroupid": this.$route.query.id
         }

src/SDrpManagement/Products/modules/list.vue

@@ -35,9 +35,10 @@
 <!--              <p class="descript">所属营销分类：<span v-for="cls in item.itemclass" :key="cls.index">{{cls.itemclassname}},</span></p>-->
               <div class="flex-align-center flex-between">
 <!--                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<small class="text-throughline">¥{{item.oldprice}}</small></p>-->
-                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<span>/{{item.unitname}}</span></p>
+                <p><span class="product-price">¥{{item.marketprice}}</span>&nbsp;<span>/{{item.unitname}}</span></p>
                 <div class="shopcart-btn">
-                  <i @click.stop="insertToShopCart(item)" style="font-size:1.5rem;color:#666" class="el-icon-shopping-cart-2"></i>
+                  <i @click.stop="insertToShopCart(item)" style="font-size:1.5rem;color:#666" class="el-icon-shopping-cart-2"
+                    v-if="usertype !== 0 && usertype !== 1"></i>
                 </div>
               </div>
             </div>
@@ -86,7 +87,8 @@ export default {
       emptyUrl:require('../../../assets/Empty.png'),
       list:[],
       total:0,
-      currentPage:0
+      currentPage:0,
+      usertype:'',
     }
   },
   methods:{
@@ -127,6 +129,7 @@ export default {
   },
   mounted () {
     this.listData()
+    this.usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
   }
 }
 

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

@@ -58,14 +58,15 @@
             width="120">
           <template slot-scope="scope">
             <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-button  size="mini" type="text" class="inline-16" @click="onSave(scope.row)" v-if="saveShow && index === scope.row.rowindex">保 存</el-button>
             <el-popconfirm
                 title="确定删除该产品类别吗?"
                 @confirm="deleteProduct(scope.row)"
             >
-              <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-button class="inline-16" slot="reference" size="mini" type="text"  :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 && 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>
+
+<!--            <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

@@ -208,14 +208,15 @@
             width="120">
           <template slot-scope="scope">
             <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-button  size="mini" type="text" class="inline-16" @click="onSave(scope.row)" v-if="saveShow && index === scope.row.rowindex">保 存</el-button>
             <el-popconfirm
                 title="确定删除该产品吗?"
                 @confirm="deleteProduct(scope.row)"
             >
-              <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-button class="inline-16" slot="reference" size="mini" type="text"  :disabled="!tool.checkAuth($route.name,'productDetails') || data.status !== '新建' || !disabled" >删 除</el-button>
             </el-popconfirm>
-            <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>
+
+<!--            <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>
@@ -405,7 +406,7 @@ export default {
     },
     async onSave(row){
       console.log(row,'进行保存')
-      row.discountrate = row.discountrate / 100
+      row.discountrate = (row.discountrate / 100).toFixed(4)
       const res = await this.$api.requested({
         "id": 20221021095403,
         "content": {

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -264,7 +264,7 @@
               </el-form-item>
             </el-col>
             <el-col  :span="24">
-              <el-form-item label="折扣:" label-width="100px" prop="discountrate">
+              <el-form-item label="折扣(%):" label-width="100px" prop="discountrate">
                 <el-input  v-model="form.discountrate" autocomplete="off" placeholder="请输入折扣" type="textarea" autosize></el-input>
               </el-form-item>
             </el-col>
@@ -447,8 +447,10 @@ export default {
         this.form.quotedpricenotes[1] = "2、报价有限期" + this.form.begdate + "至" + this.form.enddate
       }
       console.log(this.form,'form')
+
       this.$refs.form.validate(async (valid) => {
         if (!valid) return false
+        this.form.discountrate = (this.form.discountrate /100).toFixed(3)
         const res = await this.$api.requested({
           "id": 20221020164803,
           "content": this.form

src/SDrpManagement/salerOrder/index.vue

@@ -14,7 +14,7 @@
       <div slot="custom" style="display:flex">
         <div class="label_center">
           <p class="search__label">订单状态:</p>
-          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择订单状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
             <el-option value="新建" label="新建"></el-option>
             <el-option value="提交" label="提交"></el-option>
             <el-option value="审核" label="审核"></el-option>
@@ -25,7 +25,7 @@
         </div>
         <div class="label_center">
           <p class="search__label">订单类型:</p>
-          <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-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>-->

src/SDrpManagement/salerPrivatecustomer/components/duplicateCheck.vue

@@ -65,6 +65,7 @@ export default {
           type: 'success'
         });
       }
+      this.$emit('checkSuccess',res.data.length)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -33,8 +33,10 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+<!--                    <span style="float: left">{{ item.value }}</span>
+                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>-->
                     <span style="float: left">{{ item.value }}</span>
-                    <span v-if="item.remarks !== ''" style="float: right; color: #8492a6; font-size: 10px">{{ item.remarks }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -43,10 +45,12 @@
               <el-form-item label="客户等级:" >
                 <el-select v-model="form.customergrade" placeholder="请选择客户等级" style="width: 100%">
                   <el-option
-                      v-for="item in options.customerClassification"
+                      v-for="item in options.customerGrade"
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -59,6 +63,8 @@
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -182,7 +188,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>
@@ -300,7 +306,7 @@ export default {
       })
     },
     onSave(){
-      if (this.checkResults === ''){
+      if (this.checkResults === '' || this.checkResults === undefined){
         this.duplicateCheck()
       }else {
         if (this.checkResults !== 0){
@@ -526,6 +532,9 @@ export default {
       })
       this.options.type = res.data
     },
+    checkSuccess(val){
+      this.checkResults = val
+    },
   },
   mounted() {
 

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -25,6 +25,8 @@
                       :key="index"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -37,6 +39,8 @@
                       :key="item.value"
                       :label="item.value"
                       :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -312,7 +316,7 @@ export default {
     },
     onSave(){
       console.log(this.checkResults)
-      if (this.checkResults === ''){
+      if (this.checkResults === '' || this.checkResults === undefined){
         this.duplicateCheck()
       }else {
         if (this.checkResults !== 0){

src/SManagement/project_target/index.vue

@@ -13,6 +13,7 @@
           <table1 ref="table" :data="hrid">
             <template v-slot:detail="scope">
               <el-button v-if="tool.checkAuth($route.name,'read')  && scope.data.data.hrid != hrid" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">详 情</el-button>
+              <el-button v-if="tool.checkAuth($route.name,'read') && scope.data.data.status !== '新建' && scope.data.data.hrid == hrid" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">详 情</el-button>
               <el-button v-if="tool.checkAuth($route.name,'read') && scope.data.data.status === '新建' && scope.data.data.hrid == hrid" type="text" size="small" @click="$store.dispatch('changeDetailDrawer',true),$router.push({path:'/projectDetail',query:{id:scope.data.data.sa_salestargetbillid,hrid:scope.data.data.hrid,year:scope.data.year,ownerHrid:hrid}})">编 辑</el-button>
 <!--              <el-button v-if="tool.checkAuth($route.name,'update') && scope.data.data.status === '新建' " type="text" size="small" @click="$store.dispatch('DrawerShowChange',true),$router.push({path:'/editProjectInfo',query:{id:scope.data.data.hrid,year:scope.data.year}})">编辑</el-button>-->
             </template>

src/template/orderCanUseProduct/index.vue

@@ -16,24 +16,47 @@
       @selection-change="selectionChange">
       <el-table-column
         type="selection"
-        width="55">
+        width="55"
+      fixed>
       </el-table-column>
       <el-table-column
         prop="itemname"
-        label="产品名称"
+        label="商品名称"
         width="180">
       </el-table-column>
       <el-table-column
         prop="itemno"
-        label="产品编号"
+        label="编码"
         width="180">
       </el-table-column>
       <el-table-column
-        label="型号">
+        label="型号"
+        width="180">
         <template slot-scope="scope">
           <p><span>{{scope.row.model}}</span></p>
         </template>
       </el-table-column>
+      <el-table-column
+          label="规格"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.spec}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="标准"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.standards}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="材质"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.material || '--'}}</span></p>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="unit"
         label="计量单位"