代码提交

src/HDrpManagement/BrandManage/modules/add.vue

@@ -7,7 +7,8 @@
       size="800px"
       direction="rtl"
       :show-close="false"
-      append-to-body>
+      append-to-body
+      @close="drawer = false;form.brandName = ''">
       <div class="drawer__panel">
       <div>
         <el-row :gutter="50">
@@ -21,7 +22,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="drawer = false;form.brandName = ''" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit"  class="normal-btn-width">确 定</el-button>
       </div>
       </div>
@@ -71,6 +72,7 @@ export default {
         this.tool.showMessage(res, () => {
           this.ownerid = res.data
           this.drawer = false
+          this.form.brandName = ''
           this.$emit('onSuccess')
         })
       })

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

@@ -89,6 +89,7 @@
               ref="multipleTable"
               :data="list"
               style="width: 100%"
+              height="calc(100vh - 370px)"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
               :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
               @selection-change="selectionChange">
@@ -141,12 +142,12 @@
             <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"
+                  :current-page="params.content.pageNumber"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="100"
+                  layout="total,sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
             </div>
@@ -186,7 +187,7 @@ export default {
           "sa_contractid": this.$route.query.id,
           "sa_quotedpriceid":'',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }
@@ -216,7 +217,7 @@ export default {
     async listData(){
       const res = await this.$api.requested(this.params)
       this.list = res.data
-      console.log(this.list,'list')
+
       this.total = res.total
     },
     debounce (fn, wait) {
@@ -271,9 +272,9 @@ export default {
           "itemclassids":[data.itemclassid]
         },
       })
-      console.log(res,'是否重复')
+
       if (!res.data){
-        console.log(data,'不重复的数据')
+
         this.onSelect(data)
       }else {
         this.checkItem(data)
@@ -281,7 +282,7 @@ export default {
     },
 
     onSelect(val){
-      console.log(val,"选择的商品")
+
       this.tableSelectData = []
       this.tableSelectData[0] = val
       let obj = this.tableSelectData.map(e=>{
@@ -295,7 +296,7 @@ export default {
       /*this.$nextTick(()=>{
         this.onSubmit()
       })*/
-      console.log(this.selectData,"selectData")
+
       this.debounce(this.onSubmit,300)()
     },
     handleSizeChange(val) {
@@ -311,7 +312,7 @@ export default {
     selectionChange(val){
       this.tableSelectData = []
       this.tableSelectData = val
-      console.log(this.tableSelectData,"tableSelectData")
+
       let obj = this.tableSelectData.map(e=>{
         return {
           "sa_contract_itemsaleclassid":0,
@@ -320,7 +321,7 @@ export default {
         }
       })
       this.selectData = obj
-      console.log(this.selectData,"selectData")
+
     },
     onColes(){
 
@@ -333,12 +334,12 @@ export default {
           "sa_contractid":this.$route.query.id     //sat_notice_classid<=0时 为新增
         }
       })
-      console.log(res,"已选产品123456")
+
       this.selectTotal = res.total
-      console.log(res.total,"已选产品数量")
+
     },
     async priceList(){
-      console.log(this.data)
+
       this.params2.content.sa_projectid = this.data.sa_projectid
       const res = await this.$api.requested(this.params2)
       this.priceData = res.data

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

@@ -18,6 +18,7 @@
     <div class="produtMag-panel">
       <el-table
           ref="multipleTable"
+          height="calc(100vh - 500px)"
           :data="list"
           style="width: 100%"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -75,13 +76,12 @@
         <div style="float: right">
           <el-pagination
               background
-              small
-              style="text-align: right;"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="param.content.pageSize"
-              layout="total, prev, pager, next, jumper"
+              :current-page="param.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -110,7 +110,7 @@ export default {
         "content": {
           "sa_contractid": this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }

src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -27,12 +27,12 @@
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
-          small
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="params.content.pageNumber"
-          :page-size="params.content.pageSize"
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="100"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total">
       </el-pagination>
     </div>
@@ -54,7 +54,7 @@ export default {
           "content": {
               "sa_contractid": '',
               "pageNumber": 1,
-              "pageSize": 20,
+              "pageSize": 100,
               "where": {
                   "condition": "",
               }

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

@@ -13,15 +13,13 @@
         <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
           <span>已添加产品数:{{addProductLength}}</span>
           <el-pagination
-              style="display:inline-block"
               background
-              small
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="params.content.pageNumber"
               :page-sizes="[20, 50, 100, 200]"
-              :page-size="params.content.pageSize"
-              layout="total, prev, pager, next, jumper"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -58,7 +56,7 @@ export default {
         "content": {
           "sa_contractid": '',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
               "condition": "",
               "istool":0//是否是工具
@@ -73,7 +71,7 @@ export default {
   },
   updated () {
     setTimeout(() => {
-      this.addProductLength = this.$parent.list.length
+      this.addProductLength = this.$parent.total
     },300)
   },
   created () {

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -60,12 +60,12 @@
     <div style="margin-top:16px;text-align:right">
       <el-pagination
           background
-          small
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="params.content.pageNumber"
-          :page-size="params.content.pageSize"
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="100"
+          layout="total,sizes, prev, pager, next, jumper"
           :total="total">
       </el-pagination>
     </div>
@@ -87,7 +87,7 @@ export default {
           "content": {
               "sa_contractid": '',
               "pageNumber": 1,
-              "pageSize": 20,
+              "pageSize": 100,
               "where": {
                   "condition": "",
               }
@@ -125,11 +125,9 @@ export default {
     },
     qtyChange (num) {
       this.form.qty = num
-      console.log(num);
       
     },
     handleChange(num) {
-      console.log(num);
       
     },
     discountrateChange (num,data) {
@@ -151,11 +149,9 @@ export default {
         this.form.price = Math.round(num*100)/100
       }
       this.form.discountrate = Math.round((this.form.price / data.marketprice * 100)*100)/100
-      console.log(this.form.price,data.marketprice);
       
     },
     async save (data) {
-      console.log(data);
       
       this.form.discountrate = (this.form.discountrate/100).toFixed(4)
       this.form.type = data.type

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

@@ -75,14 +75,13 @@
         <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
           <span>已添加产品数:{{addProductLength}}</span>
           <el-pagination
-              style="display:inline-block"
               background
-              small
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page="params.content.pageNumber"
-              :page-size="params.content.pageSize"
-              layout="total, prev, pager, next"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -123,7 +122,7 @@ export default {
         "content": {
             "sa_contractid": '',
             "pageNumber": 1,
-            "pageSize": 20,
+            "pageSize": 100,
             "nocache":true,
             "where": {
                 "condition": ""

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

@@ -70,13 +70,12 @@
       <div style="float: right">
         <el-pagination
             background
-            small
-            style="text-align: right;"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="params.content.pageNumber"
-            :page-size="params.content.pageSize"
-            layout="total, prev, pager, next, jumper"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="100"
+            layout="total,sizes, prev, pager, next, jumper"
             :total="total">
         </el-pagination>
       </div>
@@ -100,7 +99,7 @@ export default {
         "content": {
           "sa_contractid": '',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
               "condition": ""
           }

src/HDrpManagement/projectChange/index.vue

@@ -8,6 +8,7 @@
       idName="sa_projectid" 
       :apiId="{query:20221020143502,del:''}"
       :autoQuery="false"
+      :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null}]"
       :detailPath="{path:'/projectChangeDetail',param:{tabIndex:tabIndex}}">
       <template #titleRight>
 <!--        <el-divider direction="vertical"></el-divider>
@@ -40,6 +41,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>
         </div>
@@ -51,6 +54,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>
         </div>
@@ -73,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>
         </div>
@@ -120,19 +127,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-else-if="scope.data.column.columnname === 'tag_sys'">
           <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  color="#FA8C16" size="mini" type="warning" effect="dark">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
           <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
         </div>
-        <div v-else-if="scope.data.column.columnname === 'name'">
+        <div v-else-if="scope.data.column.columnname === 'leader'">
           {{scope.data.column.data.leader[0] && scope.data.column.data.leader[0].name}}
         </div>
         <div v-else-if="scope.data.column.columnname === 'projecttype'">

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

@@ -24,7 +24,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
-              height="930"
+              height="calc(100vh - 370px)"
               :data="tableData"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"

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

@@ -9,7 +9,7 @@
           style="width: 200px;"
           :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'"
           v-model="params.content.where.condition"
-          placeholder="产品名称,编号"
+          placeholder="产品名称,产品编号,品号"
           @keyup.enter.native="listData(params.content.pageNumber= 1)"
           @clear="listData(params.content.pageNumber= 1)"
           clearable></el-input>&nbsp;
@@ -23,7 +23,7 @@
           ref="multipleTable"
           :data="list"
           style="width: 100%"
-          :height="tableHieght"
+          height="calc(100vh - 500px)"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
@@ -178,7 +178,7 @@
       </el-table>
       <div style="margin-top:16px;">
         <div style="float: left">
-          <span>金额(元)：{{tool.formatAmount(totalPrice,2)}}</span>
+          <span>金额(元)：{{totalPrice?tool.formatAmount(totalPrice,2):'0.00'}}</span>
         </div>
         <div style="float: right">
           <el-pagination

src/HDrpManagement/publicCustomer/index.vue

@@ -120,12 +120,12 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tag'">
           <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  color="#FA8C16" size="mini" type="warning" effect="dark">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
           <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -13,7 +13,7 @@
       :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'交期待确认'},{key:'status',value:'提交'},{key:'status',value:'交期确认'}]"
       :tabs="['借用单明细','发货单','物流单','收支明细']"
       @pageChange="pageChange"
-      @onEditSuccess="queryMainData($route.query.id)">
+      @onEditSuccess="onEditSuccess">
       <div slot="customOperation" class="inline-16">
           <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" class="inline-16"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
@@ -43,7 +43,7 @@
           <!-- <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button> -->
       </div>
       <div slot="slot0" >
-        <toolList :data="mainData"></toolList>
+        <toolList ref="tool" :data="mainData" @queryDetail="queryMainData"></toolList>
       </div>
        <div slot="slot1">
         <dispatch></dispatch>
@@ -98,6 +98,13 @@ export default {
       this.options = res.data
       this.value = res.data[0].value
     },
+    onEditSuccess(){
+      this.queryMainData()
+      this.queryTool()
+    },
+    queryTool(){
+      this.$refs.tool.listData()
+    },
     async queryMainData(id) {
       const res = await this.$api.requested({
         "id":20230114140402,
@@ -106,8 +113,6 @@ export default {
         }
       })
       this.mainData = res.data
-      console.log(this.mainData);
-      
       this.changeDataStructure()
       this.orderreviewtype()
     },

src/HDrpManagement/toolBorrowingMag/detail/tabs/toolList.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <addProduct :data="data" @onConfirm="listData"></addProduct>
+    <addProduct :data="data" @onConfirm="listData()"></addProduct>
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -24,7 +24,7 @@
         label="型号"
         width="150">
         <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span>></p>
+          <p><span>{{scope.row.model}}</span></p>
         </template>
       </el-table-column>
       <el-table-column
@@ -213,6 +213,7 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.$emit("queryDetail")
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -5,7 +5,8 @@
     :visible.sync="drawer"
     direction="rtl"
     append-to-body
-    size="80%">
+    size="80%"
+    @close="onClose">
     <div slot="title">
       <div class="flex-align-center">
         <p><span style="font-size:14px">合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
@@ -199,7 +200,7 @@
       </div>
     </div>
     <div class="fixed__btn__panel">
-      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+      <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>
@@ -361,6 +362,10 @@ export default {
     },
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
+    },
+    onClose(){
+      this.drawer = false
+      this.$emit('onSuccess')
     }
   },
   mounted () {

src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -26,6 +26,9 @@
         </div>
         <div v-else-if="scope.column.columnname == 'costofconstruction'">
           <span>{{scope.column.data[[scope.column.columnname]] !== 0?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):'--'}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname == 'leadername'">
+          <span>{{scope.column.data.leader ?scope.column.data.leader[0].name:'--'}}</span>
         </div>
           <div v-else-if="scope.column.columnname == 'status'">
             <span style="color:#999999" v-if="scope.column.data[[scope.column.columnname]] == '已过期'">{{scope.column.data[[scope.column.columnname]]}}</span>

src/HManagement/siteManage/securityConfig/index.vue

@@ -46,7 +46,7 @@
             <p class="explain-tips">当前设置：{{productImage.length === 0 ? '还未上传产品默认图':'已上传产品默认图'}}</p>
           </div>
         </div>
-        <productImage @setProductImage="productImage"></productImage>
+        <productImage @setProductImage="queryProductImage"></productImage>
       </div>
     </div>
     <div class="panel" style="margin-bottom:16px">

src/SDrpManagement/QuotedPrice/components/productTable.vue

@@ -25,6 +25,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
+              height="calc(100vh - 370px)"
               :data="list"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -56,33 +57,27 @@
                 width="180">
             </el-table-column>
             <el-table-column
-                label="型号"
+                prop="erpitemno"
+                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>
+                prop="standards"
+                label="标准"
+                width="100">
             </el-table-column>
             <el-table-column
-                prop="caliber"
-                label="口径"
+                label="型号"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.caliber || '--'}}</span></p>
+                <p><span>{{scope.row.model}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
-                prop="pressure"
-                label="压力"
+                label="规格"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.pressure || '--'}}</span></p>
+                <p><span>{{scope.row.spec}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
@@ -171,12 +166,12 @@
             <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"
+                  :current-page="params.content.pageNumber"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="100"
+                  layout="total,sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
             </div>
@@ -217,7 +212,7 @@ export default {
           "sa_projectid":0,
           "sa_quotedpriceid":"",
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": "",
             "tradefield":"",
@@ -270,7 +265,6 @@ export default {
       })
     },
     onSelect(val){
-      console.log(val,"选择的商品")
       this.tableSelectData = []
       this.tableSelectData[0] = val
       let obj = this.tableSelectData.map(e=>{
@@ -385,9 +379,9 @@ export default {
           "sa_quotedpriceid":this.$route.query.id     //sat_notice_classid<=0时 为新增
         }
       })
-      console.log(res,"已选产品123456")
+
       this.selectTotal = res.total
-      console.log(res.total,"已选产品数量")
+
     },
     brandChange(id) {
       this.brandId = id
@@ -408,7 +402,7 @@ export default {
       this.productData()
     },
     clickField (item) {
-      console.log(item,'clickField')
+
       this.params.content.where.tradefield = item.value
       this.productData()
     },

src/SDrpManagement/QuotedPrice/components/productTableProject.vue

@@ -25,6 +25,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
+              height="calc(100vh - 370px)"
               :data="list"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -56,33 +57,27 @@
                 width="180">
             </el-table-column>
             <el-table-column
-                label="型号"
+                prop="erpitemno"
+                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>
+                prop="standards"
+                label="标准"
+                width="100">
             </el-table-column>
             <el-table-column
-                prop="caliber"
-                label="口径"
+                label="型号"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.caliber || '--'}}</span></p>
+                <p><span>{{scope.row.model}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
-                prop="pressure"
-                label="压力"
+                label="规格"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.pressure || '--'}}</span></p>
+                <p><span>{{scope.row.spec}}</span></p>
               </template>
             </el-table-column>
             <el-table-column
@@ -171,12 +166,12 @@
             <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"
+                  :current-page="params.content.pageNumber"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="100"
+                  layout="total,sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
             </div>
@@ -215,7 +210,7 @@ export default {
           "sa_projectid":'',
           "sa_quotedpriceid":"",
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": "",
             "tradefield":"",
@@ -255,7 +250,6 @@ export default {
 
     },
     async onSubmit(){
-      console.log(this.selectData,"添加选择的商品")
       const res = await this.$api.requested({
         "id": 20221021095403,
         "content": {
@@ -275,7 +269,6 @@ export default {
       this.debounce(this.onSubmit,300)()
     },
     onSelect(val){
-      console.log(val,"选择的商品")
       this.tableSelectData = []
       this.tableSelectData[0] = val
       let obj = this.tableSelectData.map(e=>{
@@ -386,9 +379,7 @@ export default {
           "sa_quotedpriceid":this.$route.query.id     //sat_notice_classid<=0时 为新增
         }
       })
-      console.log(res,"已选产品123456")
       this.selectTotal = res.total
-      console.log(res.total,"已选产品数量")
     },
 
     brandChange(id) {
@@ -410,7 +401,6 @@ export default {
       this.productData()
     },
     clickField (item) {
-      console.log(item,'clickField')
       this.params.content.where.tradefield = item.value
       this.productData()
     },

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -141,7 +141,6 @@ export default {
       })
       /*this.mainData = res.data*/
       this.mainData = Object.assign({},this.mainData,res.data)
-      console.log(this.mainData)
       this.productList()
       /*this.$refs.productList.productData()*/
       this.$nextTick(()=>{
@@ -312,10 +311,8 @@ export default {
         }
       })
       this.totalPrice = 0
-      console.log(res.data,"产品配置信息")
       this.mainData.specialoffer = 0
       res.data.forEach((item)=> {
-        console.log(item,'item')
         if (item.discountDifferenceAmount < 0){
           this.mainData.specialoffer = 1
         }

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

@@ -22,6 +22,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
+              height="calc(100vh - 370px)"
               :data="list"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -76,12 +77,12 @@
             <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"
+                  :current-page="params.content.pageNumber"
+                  :page-sizes="[20, 50, 100, 200]"
+                  :page-size="100"
+                  layout="total,sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
             </div>
@@ -114,6 +115,8 @@ export default {
         "id": 20230219162803,
         "content": {
           "sa_quotedpriceid":this.$route.query.id,
+          "pageNumber": 1,
+          "pageSize": 100,
           "where":{
             "condition":"",
             "istool":'',
@@ -132,7 +135,6 @@ export default {
     async listData(){
       const res = await this.$api.requested(this.params)
       this.list = res.data
-      console.log(this.list,'list')
       this.total = res.total
     },
     debounce (fn, wait) {
@@ -161,7 +163,6 @@ export default {
 
     },
     onSelect(val){
-      console.log(val,"选择的商品")
       this.tableSelectData = []
       this.tableSelectData[0] = val
       let obj = this.tableSelectData.map(e=>{
@@ -175,7 +176,6 @@ export default {
       /*this.$nextTick(()=>{
         this.onSubmit()
       })*/
-      console.log(this.selectData,"selectData")
       this.debounce(this.onSubmit,300)()
     },
     handleSizeChange(val) {
@@ -199,7 +199,6 @@ export default {
         }
       })
       this.selectData = obj
-      console.log(this.selectData,"selectData")
     },
     onColes(){
 
@@ -212,9 +211,7 @@ export default {
           "sa_quotedpriceid":this.$route.query.id     //sat_notice_classid<=0时 为新增
         }
       })
-      console.log(res,"已选产品123456")
       this.selectTotal = res.total
-      console.log(res.total,"已选产品数量")
     },
 
   },

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

@@ -18,6 +18,7 @@
     <div class="produtMag-panel">
       <el-table
           ref="multipleTable"
+          height="calc(100vh - 500px)"
           :data="list"
           style="width: 100%"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -75,13 +76,12 @@
         <div style="float: right">
           <el-pagination
               background
-              small
-              style="text-align: right;"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="param.content.pageSize"
-              layout="total, prev, pager, next, jumper"
+              :current-page="param.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -111,7 +111,7 @@ export default {
         "content": {
           "sa_quotedpriceid":this.$route.query.id,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }
@@ -165,7 +165,6 @@ export default {
     },
     async onSave(row){
       row.discountrate =(row.discountrate/100).toFixed(4)
-      console.log(row,'保存的数据')
       const res = await this.$api.requested({
         "id": 20230219161303,
         "content": {

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

@@ -7,12 +7,13 @@
           class="inline-16"
           suffix-icon="el-icon-search"
           v-model="param.content.where.condition"
-          placeholder="搜索"
+          placeholder="产品名称,产品编号,品号"
           @keyup.enter.native="productData(param.content.pageNumber = 1)"
           @clear="productData(param.content.pageNumber = 1)"
           clearable>
       </el-input>&nbsp;
 <!--      <product_table style="float: right" :data="data"  ref="quoterPrice" @productAdd="productInitialization" ></product_table>-->
+      <el-button size="small" class="inline-16" :type="itemids.length === 0?'':'primary'" :disabled="itemids.length === 0" @click="deleteProducts">删除</el-button>
       <productTableProject v-if="tool.checkAuth($route.name,'productDetails') && data.status === '新建' && disabled && data.quotedpricetype === '项目报价'"  :sa_projectid="data.sa_projectid" :type="data.quotedpricetype" class="inline-16" @productAdd="productData"></productTableProject>
       <productTable v-if="tool.checkAuth($route.name,'productDetails') && data.status === '新建' && disabled"  class="inline-16" @productAdd="productData"></productTable>
     </div>
@@ -21,14 +22,16 @@
           ref="multipleTable"
           :data="list"
           style="width: 100%"
+          height="calc(100vh - 500px)"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
          >
-<!--        <el-table-column
+        <el-table-column
             type="selection"
-            width="55">
-        </el-table-column>-->
+            width="55"
+            fixed>
+        </el-table-column>
         <el-table-column
             align="center"
             label="产品图"
@@ -56,7 +59,7 @@
             width="80"
         >
           <template slot-scope="scope">
-            <p><span>{{scope.row.marketprice?scope.row.marketprice:'--'}}</span></p>
+            <p><span>{{scope.row.marketprice?tool.formatAmount(scope.row.marketprice,2):'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -122,7 +125,7 @@
             width="100"
         >
           <template slot-scope="scope">
-            <p><span>{{scope.row.discountDifferenceAmount}}</span></p>
+            <p><span>{{tool.formatAmount(scope.row.discountDifferenceAmount)}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -136,33 +139,27 @@
             width="180">
         </el-table-column>
         <el-table-column
-            label="型号"
+            prop="erpitemno"
+            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>
+            prop="standards"
+            label="标准"
+            width="100">
         </el-table-column>
         <el-table-column
-            prop="caliber"
-            label="口径"
+            label="型号"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.caliber?scope.row.caliber:'--'}}</span></p>
+            <p><span>{{scope.row.model}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="pressure"
-            label="压力"
+            label="规格"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.pressure?scope.row.pressure:'--'}}</span></p>
+            <p><span>{{scope.row.spec}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -283,17 +280,16 @@
         </el-table-column>
       </el-table>
       <div style="height: 35px;margin-top: 20px">
-        <div style="float: left">总金额(元)：{{ totalPrice }}</div>
+        <div style="float: left">总金额(元)：{{ tool.formatAmount(totalPrice,2) }}</div>
         <div style="float: right">
           <el-pagination
               background
-              small
-              style="text-align: right;"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
-              :current-page="currentPage"
-              :page-size="param.content.pageSize"
-              layout="total, prev, pager, next, jumper"
+              :current-page="param.content.pageNumber"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="100"
+              layout="total,sizes, prev, pager, next, jumper"
               :total="total">
           </el-pagination>
         </div>
@@ -334,12 +330,13 @@ export default {
         "content": {
           "sa_quotedpriceid":'',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }
         }
-      }
+      },
+      itemids:[]
     }
   },
   methods:{
@@ -385,15 +382,21 @@ export default {
       this.param.content.where.condition = this.search
       this.productData()
     },
-    selectionChange(){},
+    /*批量勾选*/
+    selectionChange(val){
+      this.itemids = []
+      val.forEach((item,index)=>{
+        this.itemids[index] = item.sa_quotedprice_itemsid
+      })
+    },
     checkForm(){
       this.$emit('checkForm')
     },
     quoterPrice(id,type){
       this.$refs.quoterPrice.queryProduct(id,type)
     },
+    /*删除添加的产品*/
     async deleteProduct(val){
-      console.log(val)
       const res = await this.$api.requested({
         "id": 20221021095603,
         "content": {
@@ -404,6 +407,29 @@ export default {
         this.productData()
       })
     },
+    /*批量删除添加的产品*/
+   deleteProducts(){
+      this.$confirm('确定删除已选的产品吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id": 20221021095603,
+          "content": {
+            "sa_quotedprice_itemsids":this.itemids     //sat_notice_classid<=0时 为新增
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.productData()
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
     onChangeNum (val,data,index) {
       data.qty = Math.round(val *100)/100
       data.amount = Math.round((data.qty * data.price) * 100)/100
@@ -463,12 +489,11 @@ export default {
       this.$emit('productData',this.list)
     },
     onEdit(row){
-      console.log(row,'进行编辑')
       this.saveShow = true
       this.index = row.rowindex
     },
     async onSave(row){
-      console.log(row,'进行保存')
+
       row.discountrate = (row.discountrate / 100).toFixed(4)
       const res = await this.$api.requested({
         "id": 20221021095403,

src/SDrpManagement/QuotedPrice/index.vue

@@ -206,7 +206,7 @@ export default {
       param.content.type = 1
     },
     list2 (data) {
-      console.log(data);
+
 
     },
     async querytemplet () {

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -117,12 +117,12 @@
         </div>
         <div v-else-if="scope.data.column.columnname === 'tag'">
           <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  color="#FA8C16" size="mini" type="warning" effect="dark">
+            <el-tag  color="#3874F6" size="mini" type="primary" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>
           <div v-for="item in scope.data.column.data.tag" :key="item.index"  style="float: left;margin-left: 5px;margin-bottom: 5px">
-            <el-tag color="#FAAB16" size="mini" type="warning" effect="dark">
+            <el-tag color="#FA8C16" size="mini" type="warning" effect="dark">
               <span>{{item}}</span>
             </el-tag>
           </div>

src/SDrpManagement/salerToolBorrowing/detail/index.vue

@@ -13,13 +13,13 @@
       :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'交期待确认'},{key:'status',value:'提交'},{key:'status',value:'交期确认'}]"
       :tabs="['借用单明细']"
       @pageChange="pageChange"
-      @onEditSuccess="queryMainData($route.query.id)">
+      @onEditSuccess="onEditSuccess">
       <div slot="customOperation" class="inline-16">
           <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
       </div>
       <div slot="slot0" >
-        <toolList :data="mainData"></toolList>
+        <toolList ref="tool" :data="mainData" @queryDetail="queryMainData" @closeTool="onEditSuccess"></toolList>
       </div>
       <div slot="slot1" >
       </div>
@@ -30,6 +30,7 @@
 <script>
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
+import {mapGetters} from "vuex";
 
 export default {
   name: "detail",
@@ -51,6 +52,10 @@ export default {
       this.options = res.data
       this.value = res.data[0].value
     },
+    onEditSuccess(){
+      this.queryMainData()
+      this.$refs.tool.listData()
+    },
     async queryMainData(id) {
       const res = await this.$api.requested({
         "id":20230114140402,

src/SDrpManagement/salerToolBorrowing/detail/tabs/toolList.vue

@@ -213,6 +213,7 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.$emit('queryDetail')
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/SDrpManagement/salerToolBorrowing/modules/edit.vue

@@ -5,7 +5,8 @@
     :visible.sync="drawer"
     direction="rtl"
     append-to-body
-    size="80%">
+    size="80%"
+    @close="onClose">
     <div slot="title">
       <div class="flex-align-center">
         <p><span style="font-size:14px">合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
@@ -198,7 +199,7 @@
       </div>
     </div>
     <div class="fixed__btn__panel">
-      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+      <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>
@@ -361,7 +362,10 @@ export default {
     addMoreProduct () {
       this.setcol === 12?this.setcol = 24 : this.setcol = 12
     },
-    
+    onClose(){
+      this.drawer = false
+      this.$emit('onSuccess')
+    }
   },
   mounted () {
   }

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -12,14 +12,14 @@
       :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'交期待确认'},{key:'status',value:'提交'},{key:'status',value:'交期确认'}]"
       :tabs="['借用单明细']"
       @pageChange="pageChange"
-      @onEditSuccess="queryMainData($route.query.id)">
+      @onEditSuccess="onEditSuccess">
       <div slot="customOperation" class="inline-16">
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.tool.listData()"/>
         <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" type="primary" size="mini" @click="confirmdate">确认交期</el-button>
         <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
       </div>
       <div slot="slot0" >
-        <toolList ref="tool" :data="mainData"></toolList>
+        <toolList ref="tool" :data="mainData" @queryDetail="queryMainData"></toolList>
       </div>
       <div slot="slot1" >
       </div>
@@ -53,6 +53,10 @@ export default {
       this.options = res.data
       this.value = res.data[0].value
     },
+    onEditSuccess(){
+      this.queryMainData()
+      this.$refs.tool.listData()
+    },
     async queryMainData(id) {
       const res = await this.$api.requested({
         "id":20230114140402,

src/SDrpManagement/toolBorrowing/detail/tabs/toolList.vue

@@ -213,6 +213,7 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.$emit('queryDetail')
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -5,7 +5,8 @@
     :visible.sync="drawer"
     direction="rtl"
     append-to-body
-    size="80%">
+    size="80%"
+    @close="onClose">
     <div slot="title">
       <div class="flex-align-center">
         <p ><span style="font-size:14px">订单合计:</span><span style="color:red;font-size:16px;"><b>¥&nbsp;{{tool.formatAmount(data.amount,2)}}</b></span></p>
@@ -211,7 +212,7 @@
       </div>
     </div>
     <div class="fixed__btn__panel">
-      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+      <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>
@@ -382,6 +383,11 @@ export default {
         // this.drawer = false
       })
     },
+    onClose(){
+      console.log("取消111")
+      this.drawer = false
+      this.$emit('onSuccess')
+    },
     onDelSuccess () {
       this.$refs.addpro.listData()
       this.$emit('onSuccess')

src/components/export_excel/index.vue

@@ -36,6 +36,18 @@ export default {
         if (e.title === '省市县') {
           table[index].title = '省'
           table.splice(index + 1,0,{title:'市',columnname:'city'},{title:'县',columnname:'county'})
+        }else if(e.title === '标签'){
+          res.data.forEach(e => {
+            if (e.tag.length !== 0){
+              e.tag_sys = e.tag_sys + ',' + e.tag
+            }else {
+              e.tag_sys = e.tag_sys
+            }
+          })
+        }else if(e.title === '项目类型'){
+          res.data.forEach(e => {
+            e.projecttype = e.projecttype + '-' + e.projecttype_remarks
+          })
         }
       });
       let hd = table.map(e=>{

src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -3,9 +3,9 @@
     <!-- <p class="detail__head__label">标签展示:</p> -->
     <div class="flex-align-center">
       <p v-if="systemtag.length === 0 && datatag.length === 0"  style="margin-right:5px;color:#ccc" >暂无标签</p>
-      <el-tag style="margin-right:5px" color="#FA8C16" v-for="item in systemtag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+      <el-tag style="margin-right:5px" color="#3874F6" v-for="item in systemtag" :key="item.rowindex" size="small" type="primary" effect="dark">{{item}}</el-tag>
       <div v-if="showTag">
-        <el-tag style="margin-right:5px" color="#FAAB16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
+        <el-tag style="margin-right:5px" color="#FA8C16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
       </div>
       <el-select
         v-if="!showTag"

src/components/productTable/index.vue

@@ -33,33 +33,27 @@
           width="180">
       </el-table-column>
       <el-table-column
-          label="型号"
+          prop="erpitemno"
+          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>
+          prop="standards"
+          label="标准"
+          width="100">
       </el-table-column>
       <el-table-column
-          prop="caliber"
-          label="口径"
+          label="型号"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.caliber || '--'}}</span></p>
+          <p><span>{{scope.row.model}}</span></p>
         </template>
       </el-table-column>
       <el-table-column
-          prop="pressure"
-          label="压力"
+          label="规格"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.pressure || '--'}}</span></p>
+          <p><span>{{scope.row.spec}}</span></p>
         </template>
       </el-table-column>
       <el-table-column

src/components/productTable/indexQty.vue

@@ -4,6 +4,7 @@
         ref="multipleTable"
         :data="data"
         style="width: 100%"
+        height="calc(100vh - 370px)"
         :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
         :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
         @selection-change="selectionChange">
@@ -92,6 +93,16 @@
           label="产品名称"
           width="180">
       </el-table-column>
+      <el-table-column
+          prop="erpitemno"
+          label="品号"
+          width="180">
+      </el-table-column>
+      <el-table-column
+          prop="standards"
+          label="标准"
+          width="100">
+      </el-table-column>
       <el-table-column
           prop="model"
           label="型号"
@@ -108,22 +119,6 @@
           <p><span>{{scope.row.spec || ''}}</span></p>
         </template>
       </el-table-column>
-      <el-table-column
-          prop="caliber"
-          label="口径"
-          width="180">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.caliber || '--'}}</span></p>
-        </template>
-      </el-table-column>
-      <el-table-column
-          prop="pressure"
-          label="压力"
-          width="180">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.pressure || '--'}}</span></p>
-        </template>
-      </el-table-column>
       <el-table-column
           prop="material"
           label="材质"

src/views/message/components/list.vue

@@ -87,10 +87,10 @@ export default {
   font-size: 12px;
   font-weight: 400;
   color: #666666;
-  max-width: 1000px;
+ /* max-width: 120px;
   white-space: nowrap;
   overflow: hidden;
-  text-overflow: ellipsis;
+  text-overflow: ellipsis;*/
 }
 .list .item-box .item .left .info {
   display: flex;
@@ -112,14 +112,14 @@ export default {
 .list .item-box .item .right .read {
   background: #FFEBEA;
   border-radius: 4px 4px 4px 4px;
-  padding: 6px 16px;
+  padding: 0.2rem 0.9rem;
   color: #FF3B30;
   font-size: 14px;
 }
 .list .item-box .item .right .no-read {
   background: #EEEEEE;
   border-radius: 4px 4px 4px 4px;
-  padding: 6px 16px;
+  padding: 0.2rem 0.9rem;
   color: #999999;
   font-size: 14px;
 }

vue.config.js

@@ -15,7 +15,7 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-            // target: 'http://192.168.3.9:8080',
+          //   target: 'http://192.168.3.9:8080',
           target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets