报价单价格调整

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

@@ -57,30 +57,63 @@
                 label="型号"
                 width="180">
               <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
                 label="规格"
                 width="180">
               <template slot-scope="scope">
-                <p><span>{{scope.row.spec}}</span></p>
+                <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="材质"
                 width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.material || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="device"
+                label="装置"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.device || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="prodline"
+                label="产线"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.prodline || '--'}}</span></p>
+              </template>
+            </el-table-column>
+            <el-table-column
+                prop="specalnote"
+                label="特殊说明"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.specalnote || '--'}}</span></p>
+              </template>
             </el-table-column>
             <el-table-column
                 prop="brand"

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

@@ -55,14 +55,14 @@
             label="型号"
             width="180">
           <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
             label="规格"
             width="180">
           <template slot-scope="scope">
-            <p><span>{{scope.row.spec}}</span></p>
+            <p><span>{{scope.row.spec || '--'}}</span></p>
           </template>
         </el-table-column>
         <!--            <el-table-column
@@ -97,6 +97,30 @@
             <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="material"
+            label="装置"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.device || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="material"
+            label="产线"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.prodline || '--'}}</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="品牌"

src/HManagement/accountManage/modules/account_detail.vue

@@ -21,6 +21,9 @@
       <div slot="slot0" >
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
+<!--      <div slot="slot1" >
+        团队信息
+      </div>-->
       <div class="container normal-panel" slot="slot1" >
         <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">
           <!-- <template v-slot:opreation="scope">

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

@@ -87,6 +87,30 @@
             <p><span>{{scope.row.material?scope.row.material:'--'}}</span></p>
           </template>
         </el-table-column>
+        <el-table-column
+            prop="device"
+            label="装置"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.device || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="prodline"
+            label="产线"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.prodline || '--'}}</span></p>
+          </template>
+        </el-table-column>
+        <el-table-column
+            prop="specalnote"
+            label="特殊说明"
+            width="180">
+          <template slot-scope="scope">
+            <p><span>{{scope.row.specalnote || '--'}}</span></p>
+          </template>
+        </el-table-column>
         <el-table-column
             prop="brand"
             label="品牌"
@@ -145,9 +169,15 @@
           <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">
+                 <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">
+                 <el-input v-model="scope.row.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.row.discountrate,scope.row,scope.$index)"></el-input>
+              </span>
             </div>
             <span v-else>
               <span v-if="saveShow && index === scope.row.rowindex">
@@ -177,9 +207,15 @@
           <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">
+                <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">
+                <el-input v-model="scope.row.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.row.price,scope.row,scope.$index)"></el-input>
+              </span>
             </div>
             <span v-else>
               <span v-if="saveShow && index === scope.row.rowindex">

src/components/productTable/index.vue

@@ -49,16 +49,49 @@
           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="材质"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.material || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="device"
+          label="装置"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.device || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="prodline"
+          label="产线"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.prodline || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="specalnote"
+          label="特殊说明"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.specalnote || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="brand"

src/components/productTable/indexQty.vue

@@ -32,33 +32,68 @@
           width="180">
       </el-table-column>
       <el-table-column
+          prop="model"
           label="型号"
           width="180">
         <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
+          prop="spec"
           label="规格"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.spec}}</span></p>
+          <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="材质"
           width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.material || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="device"
+          label="装置"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.device || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="prodline"
+          label="产线"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.prodline || '--'}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          prop="specalnote"
+          label="特殊说明"
+          width="180">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.specalnote || '--'}}</span></p>
+        </template>
       </el-table-column>
       <el-table-column
           prop="brand"