暂存

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -2,7 +2,7 @@
   <div>
     <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData"></addorderline>
     <el-table :data="list" size="mini" border>
-      <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
+      <el-table-column prop="sonum" label="订单号" width="150" fixed></el-table-column>
       <el-table-column prop="type" label="订单类型" width="90"></el-table-column>
       <el-table-column prop="checkdate" label="审核日期" width="150"></el-table-column>
       <el-table-column prop="itemno" label="产品编码" width="150"></el-table-column>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -17,16 +17,19 @@
         <el-table-column
           type="selection"
           width="55"
+          fixed
           align="center">
         </el-table-column>
         <el-table-column
             prop="rowno"
             label="行号"
+            fixed
             width="50">
         </el-table-column>
         <el-table-column
           prop="itemname"
           label="产品名称"
+          fixed
           width="180">
         </el-table-column>
         <el-table-column
@@ -48,7 +51,7 @@
           width="180">
           <template slot-scope="scope">
             <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
             <span v-else>{{scope.row.qty}}</span>
           </template>
         </el-table-column>

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

@@ -11,6 +11,7 @@
       <el-table-column
         prop="itemname"
         label="产品名称"
+        fixed
         width="180">
       </el-table-column>
       <el-table-column

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

@@ -25,8 +25,8 @@
       <div>
         <p class="normal-margin">标准:&emsp;{{selectProduct.standards}}</p>
       </div>
-      <div>
-        <p class="normal-margin">材质:&emsp;{{selectProduct.material}}</p>
+      <div v-if="selectProduct.itemextend">
+        <p class="normal-margin">材质:&emsp;{{selectProduct.itemextend[0].material}}</p>
       </div>
       <div class="flex-align-center" style="margin-bottom:30px">
         <p>数量:&emsp;</p>
@@ -58,7 +58,46 @@
           </el-tag>
         </div>
       </div>-->
-      
+      <div style="width: 700px;background: #f6f6f6;margin-bottom: 20px">
+        <el-row :gutter="20" style="margin-left: 10px">
+          <el-col :span="8" style="margin-top: 10px; " v-if="selectProduct.itemextend[0].device">
+            <span class="search__label">装置:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].device}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].prodline">
+            <span class="search__label">产线:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].prodline}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].specalnote">
+            <span class="search__label">特殊说明:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].specalnote}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].pressure">
+            <span class="search__label">压力等级:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].pressure}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].butterflyplatedrive">
+            <span class="search__label">蝶板驱动:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].butterflyplatedrive}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px" v-if="selectProduct.itemextend[0].connection">
+            <span class="search__label">连接形式:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].connection}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px;margin-bottom: 10px" v-if="selectProduct.itemextend[0].valveplatematerial">
+            <span class="search__label">阀板材质:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].valveplatematerial}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px;margin-bottom: 10px" v-if="selectProduct.itemextend[0].actuatortype">
+            <span class="search__label">执行器类型:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].actuatortype}}</span>
+          </el-col>
+          <el-col :span="8" style="margin-top: 10px;margin-bottom: 20px" v-if="selectProduct.itemextend[0].actuatorbrand">
+            <span class="search__label">执行器品牌:</span>
+            <span class="tab-color">{{selectProduct.itemextend[0].actuatorbrand}}</span>
+          </el-col>
+        </el-row>
+      </div>
       <el-button class="normal-margin" type="primary" style="width:200px" icon="el-icon-shopping-cart-full" @click="addCart"  :disabled="usertype === 0 || usertype === 1">加入购物车</el-button>
       <div style="display:flex">
         <p>相关链接:&emsp;</p>
@@ -115,6 +154,7 @@ export default {
       this.count = num
     },
     typeClick (data) {
+      console.log(data,"切换")
       this.selectProduct = data
       this.actImage = data.attinfos[0]
       this.actTradefield = data.tradefield[0].tradefield
@@ -223,4 +263,9 @@ export default {
   color:#4F7BFD;
   text-decoration: underline;
 }
+.tab-color{
+  color: #5a73d3;
+  font-size: 15px;
+  /*font-weight: bold;*/
+}
 </style>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -19,11 +19,13 @@
       <el-table-column
           prop="rowno"
           label="行号"
+          fixed
           width="50">
       </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"
+        fixed
         width="180">
       </el-table-column>
       <el-table-column

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -19,11 +19,13 @@
       <el-table-column
           prop="rowno"
           label="行号"
+          fixed
           width="50">
       </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"
+        fixed
         width="180">
       </el-table-column>
       <el-table-column

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

@@ -11,6 +11,7 @@
       <el-table-column
         prop="itemname"
         label="产品名称"
+        fixed
         width="180">
       </el-table-column>
       <el-table-column

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -2,7 +2,7 @@
   <div>
     <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData"></addorderline>
     <el-table :data="list" size="mini" border>
-      <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
+      <el-table-column prop="sonum" label="订单号" width="150" fixed></el-table-column>
       <el-table-column prop="type" label="订单类型" width="90"></el-table-column>
       <el-table-column prop="checkdate" label="审核日期" width="150"></el-table-column>
       <el-table-column prop="itemno" label="产品编码" width="150"></el-table-column>

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

@@ -11,6 +11,7 @@
       <el-table-column
         prop="itemname"
         label="产品名称"
+        fixed
         width="180">
       </el-table-column>
       <el-table-column