lrl -2021-09-17

src/views/energyPlan/components/supplyAndDemand/planProjectCBD.vue

@@ -343,6 +343,37 @@
                                 <span v-else>{{ nameObj.transportType.obj[scope.row.transportType] ? nameObj.transportType.obj[scope.row.transportType].name : scope.row.transportType }}</span>
                                 </template>
                         </el-table-column>
+                        <el-table-column
+                            prop="purpose"
+                            label="用途"
+                            width="87px"
+                            :show-overflow-tooltip="true"
+                            v-if="filterForm.data.gx === 'GX'"
+                        >
+                        <template slot-scope="scope">
+                        <el-form-item
+                                    :prop="scope.row.seq + '.purpose'"
+                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    :rules="tableFormRules.purpose"
+                                  >
+                                    <el-select
+                                    allow-create
+                                    filterable
+                                    clearable
+                                    v-model="tableFormDataObj[scope.row.seq].purpose"
+                                    placeholder=""
+                                    >
+                                    <el-option
+                                    v-for="item of nameObj.purpose.arr"
+                                    :key="item.id"
+                                    :value="item.name"
+                                    :label="item.name"
+                                    ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <span v-else>{{ nameObj.purpose.obj[scope.row.purpose] ? nameObj.purpose.obj[scope.row.purpose].name : scope.row.purpose }}</span>
+                                </template>
+                        </el-table-column>
                         <el-table-column
                             prop="receivetime"
                             label="接收时间"
@@ -510,7 +541,29 @@
                     <el-option
                     v-for="item of nameObj.transportType.arr"
                     :key="item.id"
-                    :value="item.id"
+                    :value="item.name"
+                    :label="item.name"
+                    ></el-option>
+                    </el-select>
+            </el-form-item>
+            </el-col>
+            <el-col :span="12">
+            <el-form-item
+            label="用途"
+            prop="purpose"
+            v-if="filterForm.data.gx === 'GX'"
+                >
+            <el-select
+                     filterable clearable
+                     v-model="dialog.editorBox.form.data.purpose"
+                     placeholder=""
+                     :rules="dialog.editorBox.form.purpose"
+                    style="width: 100%;"
+                    >
+                    <el-option
+                    v-for="item of nameObj.purpose.arr"
+                    :key="item.id"
+                    :value="item.name"
                     :label="item.name"
                     ></el-option>
                     </el-select>
@@ -887,6 +940,27 @@ export default {
                     arr: [],
                     showDataArr: []
                 },
+                purpose: {
+                    obj: {
+                        '0': {name: '标准件'},
+                        '1': {name: '铁丝'},
+                        '2': {name: '钢丝、弹簧'}
+                    },
+                    arr: [
+                        {
+                            id: '0',
+                            name: '标准件'
+                        },
+                        {
+                            id: '1',
+                            name: '铁丝'
+                        },
+                        {
+                            id: '2',
+                            name: '钢丝、弹簧'
+                        }
+                    ]
+                },
                 locateid: {
                     obj: {},
                     arr: []
@@ -1244,6 +1318,7 @@ export default {
                 memo: that.dialog.editorBox.form.data.memo,
                 workprocType: that.filterForm.data.workproc_type,
                 lengths: that.dialog.editorBox.form.data.lengths,
+                purpose: that.dialog.editorBox.form.data.purpose,
                 iateralArea: that.dialog.editorBox.form.data.iateralArea,
                 lengthTimesWidth: that.dialog.editorBox.form.data.lengthTimesWidth,
                 dimension: that.dialog.editorBox.form.data.dimension,
@@ -1725,6 +1800,7 @@ export default {
                                 chemicalStandard: that.tableFormDataObj[key].chemicalStandard,
                                 planWeight: that.tableFormDataObj[key].planweight,
                                 createTime: that.tableFormDataObj[key].createtime,
+                                purpose: that.tableFormDataObj[key].purpose,
                                 createMan: that.tableFormDataObj[key].createman,
                                 updateTime: that.tableFormDataObj[key].updatetime,
                                 updateMan: that.tableFormDataObj[key].updateman,

src/views/energyPlan/components/supplyAndDemand/planProjectRoundGx.vue

@@ -581,7 +581,21 @@
                         </el-form>
                     </div>
                 </div>
+                <el-row>
+                        <el-col :span="10">
                 <el-pagination
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total1"
+                    :page-sizes="[10, 20, 50, 100, 500, 1000]"
+                    :page-size="pageSize1"
+                    :current-page.sync="pageNum1"
+                    @size-change="LftetableSizeChange"
+                    @current-change="getTableData"
+                    style="text-align: left;margin-top: 10px;"
+                ></el-pagination>
+                    </el-col>
+                    <el-col :span="14">
+                  <el-pagination
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="total"
                     :page-sizes="[10, 20, 50, 100, 500, 1000]"
@@ -591,6 +605,8 @@
                     @current-change="getTableDetailDatas()"
                     style="text-align: right;margin-top: 10px;"
                 ></el-pagination>
+                       </el-col>
+                </el-row>
             </div>
         </div>
         <el-dialog
@@ -736,6 +752,9 @@ export default {
             pageNum: 1,
             pageSize: 20,
             total: 0,
+            pageNum1: 1,
+            pageSize1: 20,
+            total1: 0,
             singleTableHeight: 100,
             leftTableData: [],
             leftTableLoading: false,
@@ -1111,7 +1130,7 @@ export default {
                 });
         },
         // 获取表格中的数据
-        getTableData () {
+        getTableData (pageNum1) {
             let that = this,
                 params = {
                    workprocType: that.filterForm.data.workproc_type,
@@ -1119,8 +1138,9 @@ export default {
                    endTime: that.filterForm.data.clock[1],
                    id: that.filterForm.data.Gmid
                 };
+             that.pageNum1 = pageNum1 || that.pageNum1;
             that.leftTableLoading = true;
-            let url = 'pass/ems/v1/emsgmpcjhs/getGmDates/?pageNum=1&pageSize=' + that.pageSize;
+            let url = 'pass/ems/v1/emsgmpcjhs/getGmDates/?pageNum=' + that.pageNum1 + '&pageSize=' + that.pageSize1;
             that.axios.get(url, {
                 params: params
             })
@@ -1157,6 +1177,7 @@ export default {
                             })
                         }
                         that.leftTableData = arr;
+                        that.total1 = res.data.total;
                         that.dialog.fRow = null;
                     } else {
                         that.$message.error(res.message);
@@ -1172,6 +1193,11 @@ export default {
             that.pageSize = val;
             that.getTableDetailDatas(1);
         },
+        LftetableSizeChange (val) {
+            let that = this;
+            that.pageSize1 = val;
+            that.getTableData(1);
+        },
         // 点击查询
         getTableDetailData (row) {
             let that = this;

src/views/energyPlan/components/supplyAndDemand/planProjectRoundLG.vue

@@ -586,7 +586,21 @@
                         </el-form>
                     </div>
                 </div>
+                <el-row>
+                        <el-col :span="10">
                 <el-pagination
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total1"
+                    :page-sizes="[10, 20, 50, 100, 500, 1000]"
+                    :page-size="pageSize1"
+                    :current-page.sync="pageNum1"
+                    @size-change="LftetableSizeChange"
+                    @current-change="getTableData"
+                    style="text-align: left;margin-top: 10px;"
+                ></el-pagination>
+                    </el-col>
+                    <el-col :span="14">
+                  <el-pagination
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="total"
                     :page-sizes="[10, 20, 50, 100, 500, 1000]"
@@ -596,6 +610,8 @@
                     @current-change="getTableDetailDatas()"
                     style="text-align: right;margin-top: 10px;"
                 ></el-pagination>
+                       </el-col>
+                </el-row>
             </div>
         </div>
         <el-dialog
@@ -715,7 +731,10 @@ export default {
                 },
             pageNum: 1,
             pageSize: 20,
+            pageNum1: 1,
+            pageSize1: 20,
             total: 0,
+            total1: 0,
             singleTableHeight: 100,
             leftTableData: [],
             leftTableLoading: false,
@@ -1092,7 +1111,7 @@ export default {
                 });
         },
         // 获取表格中的数据
-        getTableData () {
+        getTableData (pageNum1) {
             let that = this,
                 params = {
                    workprocType: that.filterForm.data.workproc_type,
@@ -1100,8 +1119,9 @@ export default {
                    endTime: that.filterForm.data.clock[1],
                    id: that.filterForm.data.Gmid
                 };
+            that.pageNum1 = pageNum1 || that.pageNum1;
             that.leftTableLoading = true;
-            let url = 'pass/ems/v1/emsgmpcjhs/getGmDates/?pageNum=1&pageSize=' + that.pageSize;
+            let url = 'pass/ems/v1/emsgmpcjhs/getGmDates/?pageNum=' + that.pageNum1 + '&pageSize=' + that.pageSize1;
             that.axios.get(url, {
                 params: params
             })
@@ -1138,6 +1158,7 @@ export default {
                             })
                         }
                         that.leftTableData = arr;
+                        that.total1 = res.data.total;
                         that.dialog.fRow = null;
                     } else {
                         that.$message.error(res.message);
@@ -1153,6 +1174,11 @@ export default {
             that.pageSize = val;
             that.getTableDetailDatas(1);
         },
+        LftetableSizeChange (val) {
+            let that = this;
+            that.pageSize1 = val;
+            that.getTableData(1);
+        },
         // 点击查询
         getTableDetailData (row) {
             let that = this;

src/views/energyPlan/components/supplyAndDemand/planProjectRoundXG.vue

@@ -639,7 +639,21 @@
                         </el-form>
                     </div>
                 </div>
+                <el-row>
+                        <el-col :span="10">
                 <el-pagination
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total1"
+                    :page-sizes="[10, 20, 50, 100, 500, 1000]"
+                    :page-size="pageSize1"
+                    :current-page.sync="pageNum1"
+                    @size-change="LftetableSizeChange"
+                    @current-change="getTableData"
+                    style="text-align: left;margin-top: 10px;"
+                ></el-pagination>
+                    </el-col>
+                    <el-col :span="14">
+                  <el-pagination
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="total"
                     :page-sizes="[10, 20, 50, 100, 500, 1000]"
@@ -649,6 +663,8 @@
                     @current-change="getTableDetailDatas()"
                     style="text-align: right;margin-top: 10px;"
                 ></el-pagination>
+                       </el-col>
+                </el-row>
             </div>
         </div>
         <el-dialog
@@ -770,6 +786,9 @@ export default {
             pageNum: 1,
             pageSize: 20,
             total: 0,
+            pageNum1: 1,
+            pageSize1: 20,
+            total1: 0,
             singleTableHeight: 100,
             leftTableData: [],
             leftTableLoading: false,
@@ -1218,7 +1237,7 @@ export default {
                 });
         },
         // 获取表格中的数据
-        getTableData () {
+        getTableData (pageNum1) {
             let that = this,
                 params = {
                    workprocType: that.filterForm.data.workproc_type,
@@ -1226,8 +1245,9 @@ export default {
                    endTime: that.filterForm.data.clock[1],
                    id: that.filterForm.data.Gmid
                 };
+            that.pageNum1 = pageNum1 || that.pageNum1;
             that.leftTableLoading = true;
-            let url = 'pass/ems/v1/emsgmpcjhs/getGmDates/?pageNum=1&pageSize=' + that.pageSize;
+            let url = 'pass/ems/v1/emsgmpcjhs/getGmDates/?pageNum=' + that.pageNum1 + '&pageSize=' + that.pageSize1;
             that.axios.get(url, {
                 params: params
             })
@@ -1264,6 +1284,7 @@ export default {
                             })
                         }
                         that.leftTableData = arr;
+                        that.total1 = res.data.total;
                         that.dialog.fRow = null;
                     } else {
                         that.$message.error(res.message);
@@ -1279,6 +1300,11 @@ export default {
             that.pageSize = val;
             that.getTableDetailDatas(1);
         },
+        LftetableSizeChange (val) {
+            let that = this;
+            that.pageSize1 = val;
+            that.getTableData(1);
+        },
         // 点击查询
         getTableDetailData (row) {
             let that = this;