lrl -2021-12-09

src/views/energyBalance/components/balanceData.vue

@@ -255,24 +255,6 @@
                             width="63px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                        sortable
-                            prop="timegranid"
-                            label="时间粒度"
-                            width="75px"
-                            :show-overflow-tooltip="true"
-                        >
-                            <template slot-scope="scope">
-                                <span>{{ nameObj.timegranid.obj[scope.row.timegranid] ? nameObj.timegranid.obj[scope.row.timegranid] : scope.row.timegranid }}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column
-                            sortable
-                            prop="itemid"
-                            label="项目编号"
-                            width="103px"
-                            :show-overflow-tooltip="true"
-                        ></el-table-column>
                         <el-table-column
                             sortable
                             prop="workprocid"
@@ -309,13 +291,6 @@
                                 <span>{{ nameObj.propertyid.obj[scope.row.propertyid] ? nameObj.propertyid.obj[scope.row.propertyid] : scope.row.propertyid }}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
-                            sortable
-                            prop="itemname"
-                            label="项目名称"
-                            width="175px"
-                            :show-overflow-tooltip="true"
-                        ></el-table-column>
                         <el-table-column
                             sortable
                             prop="itemdesc"
@@ -325,38 +300,36 @@
                         ></el-table-column>
                         <el-table-column
                             sortable
-                            prop="actualvalue"
-                            label="计算值"
-                            width="110px"
+                            prop="rav"
+                            label="实绩值"
+                            width="118px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                             sortable
-                            prop="correctvalue"
-                            label="修正值"
-                            width="120px"
+                            label="分摊值"
+                            width="110px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
-                                <el-form-item
-                                    v-if="scope.row.isSelection"
-                                    :prop="'s' + scope.row.seq + '.correctvalue'"
-                                    :rules="tableFormRules.numbers"
-                                >
-                                    <el-input clearable
-                                        style="width: 100%;" @keydown.native="keyDown" :id="scope.column.id + scope.$index"
-                                        v-model.trim="tableFormDataObj['s' + scope.row.seq].correctvalue"
-                                        refcous="true"
-                                        @change="getApportvalue('s' + scope.row.seq)"
-                                    ></el-input>
-                                </el-form-item>
-                                <span v-else>{{scope.row.correctvalue}}</span>
+                                <span>{{ isNaN(scope.row.apportvalue - scope.row.rav) ? '' : floatComputed(scope.row.apportvalue, scope.row.rav, '-') }}</span>
                             </template>
                         </el-table-column>
+                        <!-- <el-table-column
+                        sortable
+                            prop="timegranid"
+                            label="时间粒度"
+                            width="75px"
+                            :show-overflow-tooltip="true"
+                        >
+                            <template slot-scope="scope">
+                                <span>{{ nameObj.timegranid.obj[scope.row.timegranid] ? nameObj.timegranid.obj[scope.row.timegranid] : scope.row.timegranid }}</span>
+                            </template>
+                        </el-table-column> -->
                         <el-table-column
                             sortable
                             prop="apportvalue"
-                            label="最终值"
+                            label="最终值(平衡)"
                             width="135px"
                             :show-overflow-tooltip="true"
                         >
@@ -378,22 +351,67 @@
                         </el-table-column>
                         <el-table-column
                             sortable
-                            prop="rav"
-                            label="实绩值"
-                            width="118px"
+                            prop="unitid"
+                            label="单位"
+                            width="65px"
+                            :show-overflow-tooltip="true"
+                        >
+                            <template slot-scope="scope">
+                                <span>{{ nameObj.unitid.obj[scope.row.unitid] ? nameObj.unitid.obj[scope.row.unitid] : scope.row.unitid }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="showno"
+                            width="100px"
+                            label="序号"
+                            align="center"
+                        ></el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="itemid"
+                            label="项目编号"
+                            width="103px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                             sortable
-                            label="分摊值"
+                            prop="itemname"
+                            label="项目名称"
+                            width="175px"
+                            :show-overflow-tooltip="true"
+                        ></el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="actualvalue"
+                            label="计算值"
                             width="110px"
                             :show-overflow-tooltip="true"
+                        ></el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="correctvalue"
+                            label="修正值"
+                            width="120px"
+                            :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
-                                <span>{{ isNaN(scope.row.apportvalue - scope.row.rav) ? '' : floatComputed(scope.row.apportvalue, scope.row.rav, '-') }}</span>
+                                <el-form-item
+                                    v-if="scope.row.isSelection"
+                                    :prop="'s' + scope.row.seq + '.correctvalue'"
+                                    :rules="tableFormRules.numbers"
+                                >
+                                    <el-input clearable
+                                        style="width: 100%;" @keydown.native="keyDown" :id="scope.column.id + scope.$index"
+                                        v-model.trim="tableFormDataObj['s' + scope.row.seq].correctvalue"
+                                        refcous="true"
+                                        @change="getApportvalue('s' + scope.row.seq)"
+                                    ></el-input>
+                                </el-form-item>
+                                <span v-else>{{scope.row.correctvalue}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                             sortable
                             prop="stdvalue"
                             label="折标值"
@@ -413,25 +431,7 @@
                             label="实绩产量"
                             width="100px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
-                        <el-table-column
-                            sortable
-                            prop="showno"
-                            width="100px"
-                            label="序号"
-                            align="center"
-                        ></el-table-column>
-                        <el-table-column
-                            sortable
-                            prop="unitid"
-                            label="单位"
-                            width="65px"
-                            :show-overflow-tooltip="true"
-                        >
-                            <template slot-scope="scope">
-                                <span>{{ nameObj.unitid.obj[scope.row.unitid] ? nameObj.unitid.obj[scope.row.unitid] : scope.row.unitid }}</span>
-                            </template>
-                        </el-table-column>
+                        ></el-table-column> -->
                         <el-table-column
                             sortable
                             prop="rectime"
@@ -647,7 +647,7 @@ export default {
         },
         // 自定义的表格合计方法：只给指定列进行合计
         getSummaries (param) {
-            const prop = ['actualvalue', 'correctvalue', 'apportvalue']; // 合计列绑定的prop
+            const prop = ['actualvalue', 'correctvalue', 'apportvalue','rav','ftz']; // 合计列绑定的prop
             return XtcommonSummaries(param, prop);
         },
         // 获取工序(供需实际)

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

@@ -552,11 +552,14 @@
                                 </el-table-column>
                                 <el-table-column
                                     align="center"
-                                    label="查看化学成分信息"
+                                    label="客户特殊要求"
                                     width="110px"
                                 >
                                 <template slot-scope="scope">
-                                <el-popover 
+                               <el-form-item
+                                v-if ="filterForm.cf"
+                               >
+                                 <el-popover 
                                 trigger="click"
                                 :ref="'popover-' + scope.row.roundid"  
                                 placement="top" 
@@ -590,6 +593,8 @@
                                             </el-table>
                                          <el-button slot="reference" type="text" class= "el-tooltip" size="mini">点击查看</el-button>
                                     </el-popover>
+                                    </el-form-item>
+                                    <span v-else>{{'无'}}</span>
                                  </template>
                                 </el-table-column>
                                 <el-table-column
@@ -828,6 +833,7 @@ export default {
             seqArr: [],
             filterForm: {
                 show: true,
+                cf: false,
                 data: {
                     id: '',
                     Gmid: '',
@@ -1233,7 +1239,7 @@ export default {
          let url = 'pass/ems/v1/chemicalconstituentss/getDataByGmid';
          let params ={};
          params = {
-             gmid: row.parentid
+             gmid: row.parentid ? row.parentid : row.id
          }
          that.gridDataLoading = true;
          that.axios.get(url, {
@@ -1252,6 +1258,7 @@ export default {
                         })
                     }
                     that.gridData = arr;
+                    that.filterForm.cf = that.gridData.length>0 ? true :false
                     that.gridDataLoading = false;
                 } else {
                     that.$message.error(res.message);
@@ -1409,6 +1416,7 @@ export default {
                     }
                     that.rightTableData = arr;
                     that.total = res.data.total;
+                    that.gethxcfDate(row);
                     } else {
                         that.$message.error(res.message);
                     }
@@ -2204,6 +2212,9 @@ export default {
                     transportType: item.transportType,
                     purpose: item.purpose,
                     chemicalStandard: item.chemicalStandard,
+                    surfaceStandard: item.surfaceStandard,
+                    lengths: item.lengths,
+                    goinfo: item.goinfo,
                     memo: item.memo,
                     issuedTime: item.issuedTime,
                     createman: item.createman,
@@ -2217,6 +2228,7 @@ export default {
                  });
                     }
                     that.rightTableData = arr;
+                    console.log(that.rightTableData);
                     that.total = res.data.total;
                     } else {
                         that.$message.error(res.message);