1.修改能源计划管理模块轮次计划编制页面

2.修改年度计划编制模块页面
3.月度计划编制页面

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

@@ -173,17 +173,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                         <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -203,20 +192,20 @@
                         </template>
                         </el-table-column>
                         <el-table-column
-                            prop="weight"
-                            label="年度计划量"
+                            prop="productid"
+                            label="产品名称"
                             width="160px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
                                 <el-form-item
                                     v-if="!isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                    :prop="scope.row.seq + '.weight'"
-                                    :rules="tableFormRules.weight"
+                                    :prop="scope.row.seq + '.productid'"
+                                    :rules="tableFormRules.productid"
                                 >
                                     <el-input clearable
                                         style="width: 100%;"
-                                        v-model="tableFormDataObj[scope.row.seq].weight"
+                                        v-model="tableFormDataObj[scope.row.seq].productid"
                                         refcous="true"
                                         @keydown.native="keyDown" :id="scope.$index + scope.column.id"
                                         @change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
@@ -225,24 +214,35 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else>{{scope.row.weight}}</span>
+                                <span v-else>{{scope.row.productid}}</span>
                             </template>
+                        </el-table-column>
+                         <el-table-column
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
                         </el-table-column>
                         <el-table-column
-                            prop="productid"
-                            label="产品名称"
+                            prop="weight"
+                            label="年度计划量"
                             width="160px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
                                 <el-form-item
                                     v-if="!isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                    :prop="scope.row.seq + '.productid'"
-                                    :rules="tableFormRules.productid"
+                                    :prop="scope.row.seq + '.weight'"
+                                    :rules="tableFormRules.weight"
                                 >
                                     <el-input clearable
                                         style="width: 100%;"
-                                        v-model="tableFormDataObj[scope.row.seq].productid"
+                                        v-model="tableFormDataObj[scope.row.seq].weight"
                                         refcous="true"
                                         @keydown.native="keyDown" :id="scope.$index + scope.column.id"
                                         @change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
@@ -251,13 +251,13 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else>{{scope.row.productid}}</span>
+                                <span v-else>{{scope.row.weight}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
                             prop="cjsj"
                             label="创建时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                          <el-table-column
@@ -269,7 +269,7 @@
                          <el-table-column
                             prop="xgsj"
                             label="修改时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -282,7 +282,7 @@
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="190px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">

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

@@ -173,17 +173,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -202,6 +191,17 @@
                                         <span>{{ nameObj.workprocid.obj[scope.row.line] ? nameObj.workprocid.obj[scope.row.line].name : scope.row.line }}</span>
                         </template>
                         </el-table-column>
+                        <el-table-column
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                             prop="weight"
                             label="年度计划量"
@@ -231,7 +231,7 @@
                         <el-table-column
                             prop="cjsj"
                             label="创建时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                          <el-table-column
@@ -243,7 +243,7 @@
                          <el-table-column
                             prop="xgsj"
                             label="修改时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -256,7 +256,7 @@
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="350px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">

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

@@ -173,17 +173,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -203,20 +192,20 @@
                         </template>
                         </el-table-column>
                         <el-table-column
-                            prop="weight"
-                            label="年度计划量"
+                            prop="productid"
+                            label="产品名称"
                             width="160px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
                                 <el-form-item
                                     v-if="!isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                    :prop="scope.row.seq + '.weight'"
-                                    :rules="tableFormRules.weight"
+                                    :prop="scope.row.seq + '.productid'"
+                                    :rules="tableFormRules.productid"
                                 >
                                     <el-input clearable
                                         style="width: 100%;"
-                                        v-model="tableFormDataObj[scope.row.seq].weight"
+                                        v-model="tableFormDataObj[scope.row.seq].productid"
                                         refcous="true"
                                         @keydown.native="keyDown" :id="scope.$index + scope.column.id"
                                         @change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
@@ -225,24 +214,35 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else>{{scope.row.weight}}</span>
+                                <span v-else>{{scope.row.productid}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
-                            prop="productid"
-                            label="产品名称"
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="weight"
+                            label="年度计划量"
                             width="160px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">
                                 <el-form-item
                                     v-if="!isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                    :prop="scope.row.seq + '.productid'"
-                                    :rules="tableFormRules.productid"
+                                    :prop="scope.row.seq + '.weight'"
+                                    :rules="tableFormRules.weight"
                                 >
                                     <el-input clearable
                                         style="width: 100%;"
-                                        v-model="tableFormDataObj[scope.row.seq].productid"
+                                        v-model="tableFormDataObj[scope.row.seq].weight"
                                         refcous="true"
                                         @keydown.native="keyDown" :id="scope.$index + scope.column.id"
                                         @change="chnageSecondVal(scope.row.seq, tableFormDataObj[scope.row.seq].secondVal, scope.$index)"
@@ -251,7 +251,7 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else>{{scope.row.productid}}</span>
+                                <span v-else>{{scope.row.weight}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column

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

@@ -151,6 +151,13 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
+                        <el-table-column
+                            prop="may"
+                            label="月份"
+                            fixed="left"
+                            width="80px"
+                            :show-overflow-tooltip="true"
+                        ></el-table-column>
                         <el-table-column
                             prop="workprocid"
                             label="工序"
@@ -161,13 +168,6 @@
                         <template slot-scope="scope">
                               <span>{{ nameObj.workprocid.obj[scope.row.workprocid] ? nameObj.workprocid.obj[scope.row.workprocid] : scope.row.workprocid }}</span>                            </template>
                         </el-table-column>
-                        <el-table-column
-                            prop="may"
-                            label="月份"
-                            fixed="left"
-                            width="80px"
-                            :show-overflow-tooltip="true"
-                        ></el-table-column>
                         <el-table-column
                             prop="productid"
                             label="产品"

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

@@ -171,17 +171,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -200,6 +189,17 @@
                                         <span>{{ nameObj.workprocid.obj[scope.row.line] ? nameObj.workprocid.obj[scope.row.line].name : scope.row.line }}</span>
                         </template>
                         </el-table-column>
+                        <el-table-column
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                             prop="weight"
                             label="年度计划量"
@@ -229,7 +229,7 @@
                         <el-table-column
                             prop="cjsj"
                             label="创建时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                          <el-table-column
@@ -241,7 +241,7 @@
                          <el-table-column
                             prop="xgsj"
                             label="修改时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -254,7 +254,7 @@
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="350px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">

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

@@ -164,17 +164,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -193,6 +182,17 @@
                                         <span>{{ nameObj.workprocid.obj[scope.row.line] ? nameObj.workprocid.obj[scope.row.line].name : scope.row.line }}</span>
                         </template>
                         </el-table-column>
+                        <el-table-column
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                             prop="weight"
                             label="年度计划量"
@@ -222,7 +222,7 @@
                         <el-table-column
                             prop="cjsj"
                             label="创建时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                          <el-table-column
@@ -234,7 +234,7 @@
                          <el-table-column
                             prop="xgsj"
                             label="修改时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -247,7 +247,7 @@
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="350px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">

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

@@ -153,17 +153,17 @@
                                 </el-table-column>
                                 <el-table-column
                                 sortable
-                                    prop="kxf_weight"
-                                    label="可下发量"
-                                    min-width="100px"
+                                    prop="weightMonth"
+                                    label="年度计划量(月)"
+                                    min-width="115px"
                                     :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>
                                 <el-table-column
                                 sortable
-                                    prop="weightMonth"
-                                    label="年度计划量(月)"
-                                    min-width="115px"
+                                    prop="kxf_weight"
+                                    label="可下发量"
+                                    min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>

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

@@ -173,17 +173,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -202,6 +191,17 @@
                                         <span>{{ nameObj.workprocid.obj[scope.row.line] ? nameObj.workprocid.obj[scope.row.line].name : scope.row.line }}</span>
                         </template>
                         </el-table-column>
+                        <el-table-column
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                             prop="weight"
                             label="年度计划量"
@@ -231,7 +231,7 @@
                         <el-table-column
                             prop="cjsj"
                             label="创建时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                          <el-table-column
@@ -243,7 +243,7 @@
                          <el-table-column
                             prop="xgsj"
                             label="修改时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -256,7 +256,7 @@
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="350px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">

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

@@ -173,17 +173,6 @@
                             width="50px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
-                            fixed="left"
-                            prop="unit"
-                            label="计量单位"
-                            width="160px"
-                            :show-overflow-tooltip="true"
-                        >
-                        <template slot-scope="scope">
-                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
-                        </template>
-                        </el-table-column>
                         <el-table-column
                             prop="yearmonth"
                             label="月份"
@@ -202,6 +191,17 @@
                                         <span>{{ nameObj.workprocid.obj[scope.row.line] ? nameObj.workprocid.obj[scope.row.line].name : scope.row.line }}</span>
                         </template>
                         </el-table-column>
+                        <el-table-column
+                            fixed="left"
+                            prop="unit"
+                            label="计量单位"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                        <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                             prop="weight"
                             label="年度计划量"
@@ -231,7 +231,7 @@
                         <el-table-column
                             prop="cjsj"
                             label="创建时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                          <el-table-column
@@ -243,7 +243,7 @@
                          <el-table-column
                             prop="xgsj"
                             label="修改时间"
-                            width="160px"
+                            width="220px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -256,7 +256,7 @@
                         <el-table-column
                             prop="memo"
                             label="备注"
-                            width="160px"
+                            width="350px"
                             :show-overflow-tooltip="true"
                         >
                             <template slot-scope="scope">