选择商品更新

src/HDrpManagement/projectChange/index.vue

@@ -98,6 +98,19 @@
           <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#999999" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已失败'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'tag'">
+          <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+            <el-tag type="warning" size="mini">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+          <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+            <el-tag  size="mini">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+
+        </div>
         <div v-else-if="scope.data.column.columnname === 'name'">
           {{scope.data.column.data.leader[0].name}}
         </div>

src/HDrpManagement/projectChange/modules/detail.vue

@@ -42,7 +42,7 @@
           </div>
         </div>
         <div>
-          <setStage  :stage="stageList" @setStage="setStage"></setStage>
+          <setStage  :stage="stageList" @setStage="setStage" style="margin-bottom: 10px"></setStage>
         </div>
       </div>
     </template>

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

@@ -4,7 +4,7 @@
     <el-drawer
         title="新增关联客户"
         :visible.sync="visible"
-        size="30%"
+        size="600px"
         direction="rtl"
         append-to-body
         :show-close="false"

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

@@ -4,7 +4,7 @@
     <el-drawer
         title="编辑关联客户"
         :visible.sync="visible"
-        size="30%"
+        size="600px"
         :show-close="false"
         direction="rtl"
         append-to-body

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

@@ -4,9 +4,10 @@
     <el-drawer
         title="设置客户类型"
         :visible.sync="visible"
-        size="20%"
+        size="600px"
         direction="rtl"
         append-to-body
+        :show-close="false"
         @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">

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

@@ -10,13 +10,13 @@
         append-to-body
         @close="onClose">
       <div class="drawer__panel">
-        <div class="flex-align-center flex-between ">
-          <div class="flex-align-center" style="margin-top:-10px;margin-bottom: 10px">
+        <div class="flex-align-center flex-between " >
+          <div class="flex-align-center" style="margin-top:-10px;margin-bottom: 10px;float: left">
             <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>
-            <el-button style="float: right" type="primary" size="mini">批量添加</el-button>
-          </div>-->
+          <div style="margin-top:-10px;margin-bottom: 10px;float: right">
+            <el-button style="float: right" type="primary" size="mini" @click="onSubmit" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+          </div>
         </div>
         <div class="produtMag-panel">
           <el-table
@@ -57,14 +57,6 @@
                 <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
               </template>
             </el-table-column>
-<!--            <el-table-column
-                prop="unitid"
-                label="起订量/增量"
-                width="150">
-              <template slot-scope="scope">
-                <p><span>{{scope.row.orderminqty}}</span>&nbsp;/&nbsp;<span>{{scope.row.orderaddqty}}</span></p>
-              </template>
-            </el-table-column>-->
             <el-table-column
                 prop="caliber"
                 label="口径"
@@ -131,33 +123,37 @@
                 <span>{{scope.row.totalPrice}}</span>
               </template>
             </el-table-column>
-<!--            <el-table-column
-                prop=""
+            <el-table-column
+                prop="totalPrice"
                 fixed="right"
                 label="操作"
                 width="80">
               <template slot-scope="scope">
-                <el-button type="text">添 加</el-button>
+                <el-button type="text" @click="onSelect(scope.row)">添 加</el-button>
               </template>
-            </el-table-column>-->
+            </el-table-column>
           </el-table>
-          <div style="margin-top:16px;text-align:right">
-            <el-pagination
-                background
-                small
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                :page-size="params.content.pageSize"
-                layout="total, prev, pager, next, jumper"
-                :total="total">
-            </el-pagination>
+          <div>
+            <div style="float: left">已选:{{selectTotal}}个商品</div>
+            <div style="margin-top:16px;text-align:right">
+              <el-pagination
+                  background
+                  small
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="params.content.pageSize"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
           </div>
+
         </div>
       </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" :disabled="tableSelectData.length === 0 " class="normal-btn-width">确 定</el-button>
+<!--        <el-button size="small" type="primary" @click="onSubmit" :disabled="tableSelectData.length === 0 " class="normal-btn-width">确 定</el-button>-->
       </div>
     </el-drawer>
   </div>
@@ -198,7 +194,8 @@ export default {
       tableSelectData:[],
       tableData: [],
       total:0,
-      currentPage:0
+      currentPage:0,
+      selectTotal:0
     }
   },
 
@@ -212,8 +209,9 @@ export default {
         },
       })
      this.tool.showMessage(res,()=>{
-       this.dialogFormVisible = false
        this.$emit('addSuccess')
+       this.listData()
+       this.selectData()
      })
       /*this.tableSelectData = []*/
       /*this.$refs['form'].validate(async (valid) => {
@@ -231,6 +229,13 @@ export default {
         })
       })*/
     },
+    onSelect(val){
+      console.log(val,"选择的商品")
+      this.tableSelectData = []
+      this.tableSelectData[0] = val
+      console.log(this.tableSelectData)
+      this.onSubmit()
+    },
     onClose(){
       this.dialogFormVisible = false
       this.tableSelectData = []
@@ -238,6 +243,7 @@ export default {
     onShow(){
       this.dialogFormVisible = true
       this.listData()
+      this.selectData()
     },
     async listData () {
       this.params.content.sa_projectid = this.$route.query.id
@@ -275,6 +281,22 @@ export default {
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();
+    },
+    /*已选产品数据*/
+    async selectData(){
+      const res = await this.$api.requested({
+        "id": 20221021145702,
+        "content": {
+          "sa_projectid": this.$route.query.id,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": ""
+          }
+        },
+      })
+      this.selectTotal = res.total
+      console.log(res.total,"已选产品数量")
     }
   },
   /*mounted() {

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

@@ -9,7 +9,7 @@
       <el-table-column
           prop="rowindex"
           label="序号"
-          width="180">
+          width="60">
       </el-table-column>
       <el-table-column
           prop="taskname"
@@ -23,7 +23,7 @@
       <el-table-column
           prop="score"
           label="分值"
-          width="180">
+          width="60">
       </el-table-column>
       <el-table-column
           prop="address"

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

@@ -29,7 +29,7 @@
     <el-drawer
         title="编辑"
         :visible.sync="drawerEdit"
-        size="25%"
+        size="600px"
         direction="rtl"
         append-to-body
         :show-close="false"
@@ -50,7 +50,7 @@
           </el-form>
         </el-row>
       </div>
-      <div class="drawer__panel" style="margin-bottom: -20px !important;border-top: 1px solid #767272;">
+      <div class="drawer__panel" style="margin-bottom: -20px !important">
         <el-row>
           <el-form :model="formData" :rules="rules" ref="formData"  size="mini" label-position="left" label-width="95px">
             <el-col :span="24">
@@ -64,8 +64,13 @@
                 <div style="width: 100%;margin-bottom: 10px;">
                   <el-radio-group v-model="item.checkedscore" v-for="(radio,index) in item.option" :key="index" @change="radioChange(item,radio)" style="width: 100%">
                     <el-radio :label="radio" style="width: 100% !important;margin-bottom: 10px">
-                      {{radio.optionname}}
-                      <span style="margin-left: 10px;font-size: 10px">{{radio.remarks}}</span>
+                      <span>
+                        {{radio.optionname}}
+                      </span>
+                      <div>
+                        <span class="remarks-color" >{{radio.remarks}}</span>
+                      </div>
+
                     </el-radio>
                   </el-radio-group>
               </div>
@@ -75,14 +80,14 @@
               <el-radio-group v-model="form.checkedscore" v-for="(radio,index) in form" :key="index" @change="radioChange(form,radio)" style="width: 100%">
                 <el-radio :label="radio" style="width: 100% !important;margin-bottom: 20px">
                   {{radio.optionname}}
-                  <span style="margin-left: 10px;font-size: 10px">{{radio.remarks}}</span>
+                  <span class="remarks-color">{{radio.remarks}}</span>
                 </el-radio>
               </el-radio-group>
             </el-col>
           </el-form>
         </el-row>
       </div>
-      <div class="drawer__panel" style="margin-bottom: -20px !important;border-top: 1px solid #767272;">
+      <div class="drawer__panel" style="margin-bottom: -20px !important">
         <el-row>
           <el-form  size="mini" label-position="right" >
             <el-col :span="24">
@@ -239,5 +244,9 @@ export default {
 </script>
 
 <style scoped>
-
+  .remarks-color{
+    color:#c0c4cc;
+    margin-left: 10px;
+    font-size: 10px;
+  }
 </style>

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

@@ -4,7 +4,7 @@
     <el-drawer
         title="评估记录"
         :visible.sync="drawer"
-        size="25%"
+        size="600px"
         direction="rtl"
         :show-close="false"
         append-to-body
@@ -37,10 +37,15 @@
                     <p>评估说明：<span style="font-size: 12px">{{i.actionnotes}}</span></p>
                   </div>
                   <div style="margin-bottom: 10px" v-for="(item,index) in i.data" :key="index">
-                    <el-tag type="warning" size="mini" v-if="item.type !== ''">{{item.type}}</el-tag>
-                    <span style="margin-left: 10px" v-if="item.type !== ''">{{item.enterprisename}}</span>
-                    <span style="float: right" v-if="item.type !== ''">{{item.optionname}}</span>
-                    <span  v-if="item.type === ''">{{item.optionname}}</span>
+                    <div v-if="item.type !== ''" style="margin-bottom: 10px">
+                      <el-tag type="warning" size="mini" >{{item.type}}</el-tag>
+                      <span style="margin-left: 10px" >{{item.enterprisename}}</span>
+                    </div>
+                    <div>
+                      <span >结果:</span>
+                      <span style="margin-left: 2px">{{item.optionname}}</span>
+                      <span style="font-size: 12px;margin-left: 5px;color: #999999">{{item.remarks}}</span>
+                    </div>
                   </div>
                 </div>
               </el-timeline-item>

src/SDrpManagement/QuotedPrice/components/edit/productTable.vue

@@ -14,6 +14,9 @@
           <div class="flex-align-center">
             <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="productData(params.content.pageNumber = 1)" @clear="productData(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="onSubmit" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+          </div>
         </div>
         <div class="produtMag-panel">
           <el-table
@@ -107,24 +110,36 @@
                   <span >{{scope.row.marketprice?scope.row.marketprice+',':'--'}}</span>
               </template>
             </el-table-column>
+            <el-table-column
+                prop="totalPrice"
+                fixed="right"
+                label="操作"
+                width="80">
+              <template slot-scope="scope">
+                <el-button type="text" @click="onSelect(scope.row)">添 加</el-button>
+              </template>
+            </el-table-column>
           </el-table>
-          <div style="margin-top:16px;text-align:right">
-            <el-pagination
-                background
-                small
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                :page-size="params.content.pageSize"
-                layout="total, prev, pager, next, jumper"
-                :total="total">
-            </el-pagination>
+          <div>
+            <div style="float: left">已选:{{selectTotal}}个商品</div>
+            <div style="margin-top:16px;text-align:right">
+              <el-pagination
+                  background
+                  small
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="params.content.pageSize"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
           </div>
         </div>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onColes" 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>
   </div>
@@ -148,6 +163,7 @@ export default {
       currentPage:0,
       tableSelectData:[],
       selectData:[],
+      selectTotal:0,
       params:{
         "id": 20221020164903,
         "version":1,
@@ -181,8 +197,30 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.dialogProductVisible = false
+        /*this.dialogProductVisible = false*/
         this.$emit('productAdd')
+        this.queryProduct()
+        this.selectListData()
+      })
+    },
+    onSelect(val){
+      console.log(val,"选择的商品")
+      this.tableSelectData = []
+      this.tableSelectData[0] = val
+      let obj = this.tableSelectData.map(e=>{
+        return {
+          sa_quotedprice_itemsid:'0',
+          itemid:e.itemid,
+          oldprice:e.marketprice,
+          /*price:(e.marketprice * 100)/100,*/
+          price:0,
+          discountrate:0,
+          qty:1
+        }
+      })
+      this.selectData = obj
+      this.$nextTick(()=>{
+        this.onSubmit()
       })
     },
     /*获取产品信息*/
@@ -190,6 +228,7 @@ export default {
       this.dialogProductVisible = true
       this.params.content.sa_projectid = 0
       this.productData()
+      this.selectListData()
     },
     /*产品配置信息*/
     async productData(){
@@ -222,6 +261,7 @@ export default {
       this.productData()
     },
     selectionChange(val){
+      this.tableSelectData = []
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -250,6 +290,18 @@ export default {
         })
         this.selectData = obj
       }
+    },
+    /*已选产品数据*/
+    async selectListData(){
+      const res = await this.$api.requested({
+        "id": 20221021095503,
+        "content": {
+          "sa_quotedpriceid":this.sa_quotedpriceid     //sat_notice_classid<=0时 为新增
+        }
+      })
+      console.log(res,"已选产品123456")
+      this.selectTotal = res.total
+      console.log(res.total,"已选产品数量")
     }
   },
   mounted() {

src/SDrpManagement/QuotedPrice/components/edit/productTableProject.vue

@@ -14,6 +14,9 @@
           <div class="flex-align-center">
             <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="productData(params.content.pageNumber = 1)" @clear="productData(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="onSubmit" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+          </div>
         </div>
         <div class="produtMag-panel">
           <el-table
@@ -107,24 +110,36 @@
                   <span >{{scope.row.marketprice?scope.row.marketprice+',':'--'}}</span>
               </template>
             </el-table-column>
+            <el-table-column
+                prop="totalPrice"
+                fixed="right"
+                label="操作"
+                width="80">
+              <template slot-scope="scope">
+                <el-button type="text" @click="onSelect(scope.row)">添 加</el-button>
+              </template>
+            </el-table-column>
           </el-table>
-          <div style="margin-top:16px;text-align:right">
-            <el-pagination
-                background
-                small
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                :page-size="params.content.pageSize"
-                layout="total, prev, pager, next, jumper"
-                :total="total">
-            </el-pagination>
+          <div>
+            <div style="float: left">已选:{{selectTotal}}个商品</div>
+            <div style="margin-top:16px;text-align:right">
+              <el-pagination
+                  background
+                  small
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="params.content.pageSize"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
           </div>
         </div>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onColes" 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>
   </div>
@@ -148,6 +163,7 @@ export default {
       currentPage:0,
       tableSelectData:[],
       selectData:[],
+      selectTotal:0,
       params:{
         "id": 20221020164903,
         "version":1,
@@ -181,8 +197,30 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.dialogProductVisible = false
+        /*this.dialogProductVisible = false*/
         this.$emit('productAdd')
+        this.queryProduct()
+        this.selectListData()
+      })
+    },
+    onSelect(val){
+      console.log(val,"选择的商品")
+      this.tableSelectData = []
+      this.tableSelectData[0] = val
+      let obj = this.tableSelectData.map(e=>{
+        return {
+          sa_quotedprice_itemsid:'0',
+          itemid:e.itemid,
+          oldprice:e.marketprice,
+          /*price:(e.marketprice * 100)/100,*/
+          price:0,
+          discountrate:0,
+          qty:1
+        }
+      })
+      this.selectData = obj
+      this.$nextTick(()=>{
+        this.onSubmit()
       })
     },
     /*获取产品信息*/
@@ -190,6 +228,7 @@ export default {
       this.dialogProductVisible = true
       this.params.content.sa_projectid = this.id
       this.productData()
+      this.selectListData()
     },
     /*产品配置信息*/
     async productData(){
@@ -229,6 +268,7 @@ export default {
       this.productData()
     },
     selectionChange(val){
+      this.tableSelectData = []
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -257,9 +297,22 @@ export default {
         })
         this.selectData = obj
       }
+    },
+    /*已选产品数据*/
+    async selectListData(){
+      const res = await this.$api.requested({
+        "id": 20221021095503,
+        "content": {
+          "sa_quotedpriceid":this.sa_quotedpriceid     //sat_notice_classid<=0时 为新增
+        }
+      })
+      console.log(res,"已选产品123456")
+      this.selectTotal = res.total
+      console.log(res.total,"已选产品数量")
     }
   },
   mounted() {
+    console.log(this.id,"输出的数据")
   }
 }
 </script>

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -14,6 +14,9 @@
           <div class="flex-align-center">
             <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="productData(params.content.pageNumber = 1)" @clear="productData(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="onSubmit" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+          </div>
         </div>
         <div class="produtMag-panel">
           <el-table
@@ -107,24 +110,36 @@
                   <span >{{scope.row.marketprice?scope.row.marketprice+',':'--'}}</span>
               </template>
             </el-table-column>
+            <el-table-column
+                prop="totalPrice"
+                fixed="right"
+                label="操作"
+                width="80">
+              <template slot-scope="scope">
+                <el-button type="text" @click="onSelect(scope.row)">添 加</el-button>
+              </template>
+            </el-table-column>
           </el-table>
-          <div style="margin-top:16px;text-align:right">
-            <el-pagination
-                background
-                small
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                :page-size="params.content.pageSize"
-                layout="total, prev, pager, next, jumper"
-                :total="total">
-            </el-pagination>
+          <div>
+            <div style="float: left">已选:{{selectTotal}}个商品</div>
+            <div style="margin-top:16px;text-align:right">
+              <el-pagination
+                  background
+                  small
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="params.content.pageSize"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
           </div>
         </div>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onColes" 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>
   </div>
@@ -148,6 +163,7 @@ export default {
       currentPage:0,
       tableSelectData:[],
       selectData:[],
+      selectTotal:0,
       sa_quotedpriceid:'',
       params:{
         "id": 20221020164903,
@@ -184,8 +200,30 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.dialogProductVisible = false
+        /*this.dialogProductVisible = false*/
         this.$emit('productAdd')
+        this.queryProduct()
+        this.selectListData()
+      })
+    },
+    onSelect(val){
+      console.log(val,"选择的商品")
+      this.tableSelectData = []
+      this.tableSelectData[0] = val
+      let obj = this.tableSelectData.map(e=>{
+        return {
+          sa_quotedprice_itemsid:'0',
+          itemid:e.itemid,
+          oldprice:e.marketprice,
+          /*price:(e.marketprice * 100)/100,*/
+          price:0,
+          discountrate:0,
+          qty:1
+        }
+      })
+      this.selectData = obj
+      this.$nextTick(()=>{
+        this.onSubmit()
       })
     },
     /*获取产品信息*/
@@ -234,6 +272,7 @@ export default {
       this.productData()
     },
     selectionChange(val){
+      this.tableSelectData = []
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -262,6 +301,18 @@ export default {
         })
         this.selectData = obj
       }
+    },
+    /*已选产品数据*/
+    async selectListData(){
+      const res = await this.$api.requested({
+        "id": 20221021095503,
+        "content": {
+          "sa_quotedpriceid":this.sa_quotedpriceid     //sat_notice_classid<=0时 为新增
+        }
+      })
+      console.log(res,"已选产品123456")
+      this.selectTotal = res.total
+      console.log(res.total,"已选产品数量")
     }
   },
   mounted() {

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -14,6 +14,9 @@
           <div class="flex-align-center">
             <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="productData(params.content.pageNumber = 1)" @clear="productData(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="onSubmit" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
+          </div>
         </div>
         <div class="produtMag-panel">
           <el-table
@@ -107,24 +110,36 @@
                   <span >{{scope.row.marketprice?scope.row.marketprice+',':'--'}}</span>
               </template>
             </el-table-column>
+            <el-table-column
+                prop="totalPrice"
+                fixed="right"
+                label="操作"
+                width="80">
+              <template slot-scope="scope">
+                <el-button type="text" @click="onSelect(scope.row)">添 加</el-button>
+              </template>
+            </el-table-column>
           </el-table>
-          <div style="margin-top:16px;text-align:right">
-            <el-pagination
-                background
-                small
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="currentPage"
-                :page-size="params.content.pageSize"
-                layout="total, prev, pager, next, jumper"
-                :total="total">
-            </el-pagination>
+          <div>
+            <div style="float: left">已选:{{selectTotal}}个商品</div>
+            <div style="margin-top:16px;text-align:right">
+              <el-pagination
+                  background
+                  small
+                  @size-change="handleSizeChange"
+                  @current-change="handleCurrentChange"
+                  :current-page="currentPage"
+                  :page-size="params.content.pageSize"
+                  layout="total, prev, pager, next, jumper"
+                  :total="total">
+              </el-pagination>
+            </div>
           </div>
         </div>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onColes" 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>
   </div>
@@ -148,6 +163,7 @@ export default {
       currentPage:0,
       tableSelectData:[],
       selectData:[],
+      selectTotal:0,
       sa_quotedpriceid:'',
       params:{
         "id": 20221020164903,
@@ -184,8 +200,30 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
-        this.dialogProductVisible = false
+        /*this.dialogProductVisible = false*/
         this.$emit('productAdd')
+        this.queryProduct()
+        this.selectListData()
+      })
+    },
+    onSelect(val){
+      console.log(val,"选择的商品")
+      this.tableSelectData = []
+      this.tableSelectData[0] = val
+      let obj = this.tableSelectData.map(e=>{
+        return {
+          sa_quotedprice_itemsid:'0',
+          itemid:e.itemid,
+          oldprice:e.marketprice,
+          /*price:(e.marketprice * 100)/100,*/
+          price:0,
+          discountrate:0,
+          qty:1
+        }
+      })
+      this.selectData = obj
+      this.$nextTick(()=>{
+        this.onSubmit()
       })
     },
     /*获取产品信息*/
@@ -233,6 +271,7 @@ export default {
       this.productData()
     },
     selectionChange(val){
+      this.tableSelectData = []
       this.tableSelectData = val
       if (this.type === '项目报价'){
         let obj = this.tableSelectData.map(e=>{
@@ -261,6 +300,18 @@ export default {
         })
         this.selectData = obj
       }
+    },
+    /*已选产品数据*/
+    async selectListData(){
+      const res = await this.$api.requested({
+        "id": 20221021095503,
+        "content": {
+          "sa_quotedpriceid":this.sa_quotedpriceid     //sat_notice_classid<=0时 为新增
+        }
+      })
+      console.log(res,"已选产品123456")
+      this.selectTotal = res.total
+      console.log(res.total,"已选产品数量")
     }
   },
   mounted() {

src/SDrpManagement/QuotedPrice/index.vue

@@ -72,6 +72,19 @@
           </div>
           <div v-else>--</div>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'tag'">
+          <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+            <el-tag type="warning" size="mini">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+          <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+            <el-tag  size="mini">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+
+        </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -119,6 +119,19 @@
           <span v-if="scope.data.column.data['leader'].length !== 0">已分配</span>
           <span v-else>未分配</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'tag'">
+          <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+            <el-tag type="warning" size="mini">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+          <div v-for="item in scope.data.column.data.tag_sys" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
+            <el-tag  size="mini">
+              <span>{{item}}</span>
+            </el-tag>
+          </div>
+
+        </div>
         <div v-else-if="scope.data.column.columnname === 'tradingstatus'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '未成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已成交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -186,6 +186,9 @@ export default {
         roleids: [
           { required: true, message: '请选择授权角色', trigger: 'change' }
         ],
+        type: [
+          { required: true, message: '请选择客户类型', trigger: 'change' }
+        ],
       },
       form:{
         "sat_orderclueid": '',