信用调整,工具借用，项目商机产品配置

src/HDrpManagement/Creditbilladj/modules/enterpriseTable/add.vue

@@ -76,6 +76,13 @@
               <el-input type="text" size="small" placeholder="额度" v-model.number="scope.row.creditquota"></el-input>
             </template>
           </el-table-column>
+          <el-table-column
+              prop="remarks"
+              label="备注">
+            <template slot-scope="scope">
+              <el-input type="text" size="small" placeholder="备注" v-model.number="scope.row.remarks"></el-input>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
       <div class="fixed__btn__panel">
@@ -150,7 +157,7 @@ export default {
               "sys_enterpriseid":item.sys_enterpriseid,
               "sa_accountclassid":item.sa_accountclassid,
               "creditquota":item.creditquota,
-              "remarks":''
+              "remarks":item.remarks
           }
         })
         const res = await this.$api.requested({

src/HDrpManagement/contractManage/components/toolList/addTool.vue

@@ -8,7 +8,7 @@
           <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
           <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="batchSelects">批 量 添 加</el-button>
         </div>
-        <Table  ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData" @selection="selectArr" @onSelect="batchSelect">
+        <Table  ref="table" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="calc(100vh - 550px)"  @upDateData="upDateData" @selection="selectArr" @onSelect="batchSelect">
         </Table>
         <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
           <span>已添加产品数:{{addProductLength}}</span>
@@ -56,7 +56,7 @@ export default {
         "content": {
           "sa_contractid": '',
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
               "condition": "",
               "istool":1//是否是工具
@@ -79,7 +79,7 @@ export default {
   },
   updated () {
     setTimeout(() => {
-      this.addProductLength = this.$parent.list.length
+      this.addProductLength = this.$parent.total
     },300)
   },
   methods: {

src/HDrpManagement/contractManage/components/toolList/toolList.vue

@@ -82,7 +82,7 @@ export default {
           "content": {
               "sa_contractid": '',
               "pageNumber": 1,
-              "pageSize": 20,
+              "pageSize": 100,
               "where": {
                   "condition": "",
               }

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

@@ -24,6 +24,7 @@
         <div class="produtMag-panel">
           <el-table
               ref="multipleTable"
+              height="930"
               :data="tableData"
               style="width: 100%"
               :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
@@ -54,33 +55,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
@@ -193,12 +188,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>
@@ -241,7 +236,7 @@ export default {
         "content": {
           "sa_projectid": 2,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": "",
             "tradefield": "",

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

@@ -23,13 +23,15 @@
           ref="multipleTable"
           :data="list"
           style="width: 100%"
+          :height="tableHieght"
           :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
           :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
           @selection-change="selectionChange"
           >
         <el-table-column
             type="selection"
-            width="55">
+            width="55"
+            fixed>
         </el-table-column>
         <el-table-column
             align="center"
@@ -52,41 +54,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="unitid"
-                        label="起订量/增量"
-                        width="150">
-                      <template slot-scope="scope">
-                        <p><span>{{scope.row.orderminqty}}</span>&nbsp;/&nbsp;<span>{{scope.row.orderaddqty}}</span></p>
-                      </template>
-                    </el-table-column>-->
         <el-table-column
-            prop="caliber"
-            label="口径"
+            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
@@ -194,14 +182,13 @@
         </div>
         <div style="float: right">
           <el-pagination
-              style="text-align:right"
               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>
@@ -223,7 +210,7 @@ export default {
   components:{add,uploadFile, previewImage,delete_product},
   data () {
     return {
-      tableHieght:"600px",
+      tableHieght:"860px",
       totalPrice:0,
       tablecols:[],
       list:[],
@@ -239,7 +226,7 @@ export default {
         "content": {
           "sa_projectid": 2,
           "pageNumber": 1,
-          "pageSize": 20,
+          "pageSize": 100,
           "where": {
             "condition": ""
           }

src/components/productTable/index.vue

@@ -4,6 +4,7 @@
         ref="multipleTable"
         :data="data"
         style="width: 100%"
+        height="calc(100vh - 250px)"
         :header-cell-style="{height:'50px',color:'#606266',fontWeight:'400'}"
         :cell-style="{height:'50px',color:'#666666',fontWeight:'400'}"
         @selection-change="selectionChange">