Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/projectChange/modules/detail.vue

@@ -71,8 +71,8 @@
 </template>
 
 <script>
-import Quotation from './modules/quotation/index'
-import product_set from './modules/productSet/index'
+import Quotation from './modules/quotation/index.vue'
+import product_set from './modules/productSet/index.vue'
 import Rival from './modules/rival/index'
 import BaseInfo from './modules/baseInfo/baseInfo'
 import StageTask from './modules/stageTask/index'

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

@@ -41,7 +41,7 @@
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
-          >
+          border>
         <el-table-column
             type="selection"
             width="55"
@@ -58,13 +58,13 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="itemno"
-            label="产品编号"
+            prop="itemname"
+            label="商品名称"
             width="180">
         </el-table-column>
         <el-table-column
-            prop="itemname"
-            label="产品名称"
+            prop="itemno"
+            label="编码"
             width="180">
         </el-table-column>
         <el-table-column
@@ -72,11 +72,6 @@
             label="品号"
             width="180">
         </el-table-column>
-        <el-table-column
-            prop="standards"
-            label="标准"
-            width="100">
-        </el-table-column>
         <el-table-column
             label="型号"
             width="180">
@@ -85,66 +80,51 @@
           </template>
         </el-table-column>
         <el-table-column
-            label="规格"
-            width="180">
+            prop="marketprice"
+            label="牌价(元)"
+            width="100">
           <template slot-scope="scope">
-            <p><span>{{scope.row.spec || '--'}}</span></p>
+            <p><span>{{scope.row.marketprice?tool.formatAmount(scope.row.marketprice,2):'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="material"
-            label="材质"
+            prop="qty"
+            label="数量"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
+            <el-input-number v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="numChange(scope.row.qty,scope.$index,scope.row)" :disabled="!data.disabled"></el-input-number>
           </template>
         </el-table-column>
         <el-table-column
-            prop="material"
-            label="装置"
-            width="180">
+            prop="price"
+            label="单价(元)"
+            width="120">
           <template slot-scope="scope">
-            <p><span>{{scope.row.device || '--'}}</span></p>
+            <el-input v-model="scope.row.price" size="mini"    @change="priceChange(scope.row.price,scope.$index,scope.row)" :disabled="!data.disabled"></el-input>
           </template>
         </el-table-column>
+        
         <el-table-column
-            prop="material"
-            label="产线"
+            label="规格"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.prodline || '--'}}</span></p>
+            <p><span>{{scope.row.spec || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
             prop="material"
-            label="特殊说明"
-            width="180">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.specalnote || '--'}}</span></p>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="brand"
-            label="品牌"
+            label="材质"
             width="180">
           <template slot-scope="scope">
-            <p v-for="(item,index) in scope.row.brand">
-              <span style="float: left" v-if="index === scope.row.brand.length -1">{{item?item.brandname+'':'--'}}</span>
-              <span style="float: left" v-else>{{item?item.brandname+',':'--'}}</span>
-            </p>
+            <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="itemclass"
-            label="类别"
-            width="180">
-          <template slot-scope="scope">
-            <p v-for="(item,index) in scope.row.itemclass">
-              <span style="float: left" v-if="index === scope.row.itemclass.length -1">{{item?item.itemclassname+'':'--'}}</span>
-              <span style="float: left" v-else>{{item?item.itemclassname+',':'--'}}</span>
-            </p>
-          </template>
+            prop="standards"
+            label="标准"
+            width="100">
         </el-table-column>
+       
         <el-table-column
             prop="unitid"
             label="计量单位"
@@ -154,30 +134,27 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="marketprice"
-            label="牌价(元)"
-            fixed="right"
-            width="100">
+            prop="material"
+            label="产线"
+            width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.marketprice?tool.formatAmount(scope.row.marketprice,2):'--'}}</span></p>
+            <p><span>{{scope.row.prodline || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="qty"
-            label="数量"
-            fixed="right"
+            prop="material"
+            label="装置"
             width="180">
           <template slot-scope="scope">
-            <el-input-number v-model="scope.row.qty" size="mini" :min="1"  label="描述文字" @change="numChange(scope.row.qty,scope.$index,scope.row)" :disabled="!data.disabled"></el-input-number>
+            <p><span>{{scope.row.device || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
-            prop="price"
-            label="单价(元)"
-            fixed="right"
-            width="120">
+            prop="material"
+            label="特殊说明"
+            width="180">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="mini"    @change="priceChange(scope.row.price,scope.$index,scope.row)" :disabled="!data.disabled"></el-input>
+            <p><span>{{scope.row.specalnote || '--'}}</span></p>
           </template>
         </el-table-column>
         <el-table-column

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -56,7 +56,7 @@ import revoke from './components/revoke'
 import examine_to from './components/examineTo'
 import project_change from './modules/projectChange/index'
 import customer_assocalated from './modules/customerAssociated/index'
-import productInventory from './modules/productInventory/index'
+import productInventory from './modules/productInventory/index.vue'
 import toVoid from './components/toVoid'
 import historicalQuotation from './modules/historicalQuotation/index'
 import copyTo from "@/SDrpManagement/QuotedPrice/detail/components/copyTo";

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

@@ -10,7 +10,8 @@
           placeholder="产品名称,产品编号,品号"
           @keyup.enter.native="productData(param.content.pageNumber = 1)"
           @clear="productData(param.content.pageNumber = 1)"
-          clearable>
+          clearable
+          border>
       </el-input>&nbsp;
 <!--      <product_table style="float: right" :data="data"  ref="quoterPrice" @productAdd="productInitialization" ></product_table>-->
       <uploadAllData
@@ -45,7 +46,7 @@
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
-         >
+         border>
         <el-table-column
             type="selection"
             width="55"
@@ -62,14 +63,25 @@
           </template>
         </el-table-column>
         <el-table-column
-            prop="num"
-            label="数量"
-            width="160"
-        >
+            prop="itemname"
+            label="商品名称"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            prop="itemno"
+            label="编码"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            prop="erpitemno"
+            label="品号"
+            width="180">
+        </el-table-column>
+        <el-table-column
+            label="型号"
+            width="180">
           <template slot-scope="scope">
-            <span>
-              <el-input-number :disabled="!saveShow || index !== scope.row.rowindex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
-            </span>
+            <p><span>{{scope.row.model}}</span></p>
           </template>
         </el-table-column>
         <el-table-column
@@ -81,6 +93,18 @@
             <p><span>{{scope.row.marketprice?tool.formatAmount(scope.row.marketprice,2):'--'}}</span></p>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="num"
+            label="数量"
+            width="160"
+        >
+          <template slot-scope="scope">
+            <span>
+              <el-input-number :disabled="!saveShow || index !== scope.row.rowindex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
+            </span>
+          </template>
+        </el-table-column>
+        
         <el-table-column
             prop="discountrate"
             label="折扣(%)"
@@ -88,14 +112,12 @@
         >
           <template slot-scope="scope">
             <div v-if="scope.row.discountDifferenceAmount >= 0 ">
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{scope.row.discountrate}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
+              <span v-if="tool.checkAuth($route.name,'productDetails') || data.status == '新建' || disabled">
                  <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
               </span>
             </div>
             <div v-else-if="scope.row.discountDifferenceAmount < 0 ">
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{scope.row.discountrate}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
+              <span v-if="tool.checkAuth($route.name,'productDetails') || data.status == '新建' || disabled">
                  <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
               </span>
             </div>
@@ -117,14 +139,14 @@
         >
           <template slot-scope="scope">
             <div v-if="scope.row.discountDifferenceAmount >= 0 ">
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
+              <p v-if="!disabled"><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+              <span v-if="tool.checkAuth($route.name,'productDetails') || data.status == '新建' || disabled">
                 <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
               </span>
             </div>
             <div v-else-if="scope.row.discountDifferenceAmount < 0 " >
-              <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
-              <span v-if="saveShow && index === scope.row.rowindex">
+              <p v-if="!disabled"><span :style="[setDownColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
+              <span v-if="tool.checkAuth($route.name,'productDetails') || data.status == '新建' || disabled">
                 <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
               </span>
             </div>
@@ -147,33 +169,9 @@
             <p><span>{{tool.formatAmount(scope.row.discountDifferenceAmount,2)}}</span></p>
           </template>
         </el-table-column>
-        <el-table-column
-            prop="itemno"
-            label="产品编号"
-            width="180">
-        </el-table-column>
-        <el-table-column
-            prop="itemname"
-            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
-            label="型号"
-            width="180">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.model}}</span></p>
-          </template>
-        </el-table-column>
+        
+        
+        
         <el-table-column
             label="规格"
             width="180">
@@ -189,6 +187,19 @@
             <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="standards"
+            label="标准"
+            width="100">
+        </el-table-column>
+        <el-table-column
+            prop="unitid"
+            label="计量单位"
+            width="100">
+          <template slot-scope="scope">
+            <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}/{{scope.row.axunitname}}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column
             prop="device"
             label="装置"
@@ -213,36 +224,7 @@
             <p><span>{{scope.row.specalnote || '--'}}</span></p>
           </template>
         </el-table-column>
-        <el-table-column
-            prop="brand"
-            label="品牌"
-            width="200">
-          <template slot-scope="scope">
-            <p v-for="(item,index) in scope.row.brand">
-              <span style="float: left" v-if="index === scope.row.brand.length -1">{{item?item.brandname+'':'--'}}</span>
-              <span style="float: left" v-else>{{item?item.brandname+',':'--'}}</span>
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="itemclass"
-            label="类别"
-            width="200">
-          <template slot-scope="scope">
-            <p v-for="(item,index) in scope.row.itemclass">
-              <span style="float: left" v-if="index === scope.row.itemclass.length -1">{{item?item.itemclassname+'':'--'}}</span>
-              <span style="float: left" v-else>{{item?item.itemclassname+',':'--'}}</span>
-            </p>
-          </template>
-        </el-table-column>
-        <el-table-column
-            prop="unitid"
-            label="计量单位"
-            width="100">
-          <template slot-scope="scope">
-            <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}/{{scope.row.axunitname}}</el-tag>
-          </template>
-        </el-table-column>
+        
 
         <el-table-column
             prop="mindiscountrate"
@@ -279,7 +261,7 @@
             <p v-else>--</p>
           </template>
         </el-table-column>
-        <el-table-column
+        <!-- <el-table-column
             prop="operation"
             fixed="right"
             label="操作"
@@ -294,9 +276,9 @@
               <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="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-column> -->
       </el-table>
       <div style="height: 35px;margin-top: 20px">
         <div style="float: left">总金额(元)：{{ tool.formatAmount(totalPrice,2) }}</div>
@@ -588,6 +570,7 @@ export default {
       }
       this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
+      this.onSave(this.list[index])
     },
     onChangeDiscountrate(val,data,index) {
       data.specialoffer = 0
@@ -611,6 +594,7 @@ export default {
       }
       this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
+      this.onSave(this.list[index])
     },
     onChangePrice(val,data,index){
       data.specialoffer = 0
@@ -634,6 +618,7 @@ export default {
       }
       this.totalPrice = Math.round(this.totalPrice * 100)/100
       this.$emit('productData',this.list)
+      this.onSave(this.list[index])
     },
     onEdit(row){
       this.saveShow = true

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -30,7 +30,7 @@
         <el-empty description="暂无负责人" :image-size="40"></el-empty>
       </div>
     </div>
-    <div class="flex-align-center" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
+    <!-- <div class="flex-align-center" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
       <p style="flex:1;padding:10px 0;color:#999">参与者</p>
       <el-popover
         placement="right"
@@ -40,8 +40,8 @@
         <member ref="member1" :justsaler="justsaler" :param="param" :radio="false" :checked="item.team" @onSelect="onSubmit" @onCancel="visible = false"></member>
         <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" size="small" slot="reference"  @click="showMenberSelect1(item)">添加</el-button>
       </el-popover>
-    </div>
-    <div style="padding:10px">
+    </div> -->
+    <!-- <div style="padding:10px">
       <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 0" v-for="men in item.team" :key="men.index">
         <div class="avatar inline-16"  :class="men.isleader === 1?'leader':''" >
           <img class="avatar__image" v-if="men.headpic" :src="men.headpic" alt="">
@@ -54,7 +54,7 @@
         <div style="float: right;margin-left: 60px">
           <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" @click="setClick(men)" size="mini">设置</el-button>
         </div>
-      </div>
+      </div> -->
 
       <div v-if="showEmpty(item.team)">
         <el-empty description="暂无成员" :image-size="40"></el-empty>