lrl - 2021-09-27

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

@@ -124,7 +124,6 @@
                             type="selection"
                             width="40"
                             align="center"
-                            :selectable='checkboxT'
                             fixed="left"
                             class-name="cnspicuous"
                         ></el-table-column>
@@ -213,7 +212,7 @@
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                             sortable
                             prop="lengthTimesWidth"
                             label="高度*宽度"
@@ -221,7 +220,7 @@
                             width="120px"
                             :show-overflow-tooltip="true"
                         >
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column
                             sortable
                             prop="planWeight"
@@ -548,7 +547,7 @@ export default {
             }
         }
         that.getUnitIdData();
-        that.getlengthTimesWidth();
+        // that.getlengthTimesWidth();
         that.getRoles();
     },
     methods: {
@@ -739,28 +738,27 @@ export default {
                 });
         },
         // 获取型钢宽度*长度
-        getlengthTimesWidth () {
-            let that = this
-            let url = 'pass/ems/v1/emsprodplanrounds/getlengthTimesWidth';
-            that.axios.get(url)
-                .then(function (res) {
-                    if (res.code === '0') {
-                        let arr = [];
-                        let obj = {};
-                        for (let item of res.data) {
-                            arr.push({
-                                id: item.id,
-                                name: item.lengthTimesWidth
-                            })
-                        }
-                        that.nameObj.lengthTimeswidth.arr = arr;
-                        that.nameObj.lengthTimeswidth.obj = obj;
-                        console.log(that.nameObj.lengthTimeswidth);
-                    } else {
-                        that.$message.error(res.message);
-                    }
-                });
-        },
+        // getlengthTimesWidth () {
+        //     let that = this
+        //     let url = 'pass/ems/v1/emsprodplanrounds/getbasespecbillet';
+        //     that.axios.get(url)
+        //         .then(function (res) {
+        //             if (res.code === '0') {
+        //                 let arr = [];
+        //                 let obj = {};
+        //                 for (let item of res.data) {
+        //                     arr.push({
+        //                         id: item.id,
+        //                         name: item.specifications
+        //                     })
+        //                 }
+        //                 that.nameObj.specifications.arr = arr;
+        //                 that.nameObj.specifications.obj = obj;
+        //             } else {
+        //                 that.$message.error(res.message);
+        //             }
+        //         });
+        // },
         connn () {
             let that = this;
             if (!that.filterForm.data.networkid || that.filterForm.data.networkid.length === 0) {

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

@@ -40,7 +40,6 @@
                             </el-form-item>
                         </el-col>
                       <el-col :span="6"
-                      v-if="filterForm.data.gx != 'XG'"
                       >
                           <el-form-item label="规格">
                             <el-select
@@ -59,7 +58,7 @@
                             </el-select>
                             </el-form-item>
                       </el-col>
-                      <el-col :span="6"
+                      <!-- <el-col :span="6"
                       v-if="filterForm.data.gx==='XG'"
                       >
                           <el-form-item label="宽度*高度">
@@ -78,7 +77,7 @@
                             ></el-option>
                             </el-select>
                             </el-form-item>
-                      </el-col>
+                      </el-col> -->
                     </el-row>
                 </el-form>
                 <div class="box-top-gjl">
@@ -95,7 +94,20 @@
                                     :loading="loading"
                                     v-if="butPrivilege.PUT && !isCheck"
                                 >新增</el-button>
-                                <el-button
+                                <el-upload
+                                  style="display: inline-block;margin-left:5px"
+                                  action=""
+                                  :on-progress='beforeUpload'
+                                  :multiple='false'
+                                  :limit="1"
+                                  accept=".xls"
+                                  :show-file-list="false"
+                                  ><el-button
+                                  size="mini"
+                                  type="primary"
+                                  :loading='loading'>导入</el-button>
+                                  </el-upload>
+                                  <el-button
                                     class="button"
                                     type="primary"
                                     size="mini"
@@ -143,19 +155,6 @@
                                     @click="but_del_plural()"
                                     :loading="loading"
                                 >删除</el-button>
-                                <el-upload
-                                  style="display: inline-block;margin-left:5px"
-                                  action=""
-                                  :on-progress='beforeUpload'
-                                  :multiple='false'
-                                  :limit="1"
-                                  accept=".xls"
-                                  :show-file-list="false"
-                                  ><el-button
-                                  size="mini"
-                                  type="primary"
-                                  :loading='loading'>导入</el-button>
-                                  </el-upload>
                             </el-col>
                             <el-col :span="8">
                                 <div style="float:right; text-align: right;">
@@ -211,11 +210,11 @@
                             type="selection"
                             width="40"
                             align="center"
-                            :selectable='checkboxT'
                             fixed="left"
                             class-name="cnspicuous"
                         ></el-table-column>
                         <el-table-column
+                        sortable
                             prop="id"
                             label="编号"
                             fixed="left"
@@ -224,6 +223,7 @@
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
+                        sortable
                             prop="jhTime"
                             label="排产日期"
                             align="center"
@@ -232,6 +232,7 @@
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
+                        sortable
                             prop="deliveryDate"
                             label="交货日期"
                             align="center"
@@ -240,6 +241,7 @@
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
+                        sortable
                             prop="state"
                             label="状态"
                             align="center"
@@ -254,6 +256,7 @@
                         </template>
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="grades"
                             label="钢种"
                             align="center"
@@ -286,12 +289,13 @@
                                 </template>
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="specifications"
                             label="规格"
+                            fixed="left"
                             align="center"
                             width="120px"
                             :show-overflow-tooltip="true"
-                            v-if="filterForm.data.gx!='XG'"
                         >
                         <template slot-scope="scope">
                                 <el-form-item
@@ -318,8 +322,10 @@
                             </template>
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="lengths"
                             label="长度(mm)"
+                            fixed="left"
                             align="center"
                             width="90px"
                             :show-overflow-tooltip="true"
@@ -342,6 +348,7 @@
                         </template>
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="planweight"
                             align="center"
                             label="计划量"
@@ -364,10 +371,12 @@
                                 <span v-else>{{scope.row.planweight}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
+                        sortable
                             prop="lengthtimeswidth"
                             label="高度*宽度"
                             align="center"
+                            fixed="left"
                             width="120px"
                             :show-overflow-tooltip="true"
                             v-if="filterForm.data.gx ==='XG'"
@@ -395,8 +404,9 @@
                                 </el-form-item>
                                 <span v-else>{{ nameObj.lengthTimeswidth.obj[scope.row.lengthtimeswidth] ? nameObj.lengthTimeswidth.obj[scope.row.lengthtimeswidth].name : scope.row.lengthtimeswidth }}</span>
                             </template>
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column
+                        sortable
                             prop="transportType"
                             label="运输方式"
                             align="center"
@@ -429,6 +439,7 @@
                                 </template>
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="purpose"
                             label="用途"
                             align="center"
@@ -461,6 +472,7 @@
                                 </template>
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="receivetime"
                             label="接收时间"
                             align="center"
@@ -469,6 +481,7 @@
                         ></el-table-column>
 
                         <el-table-column
+                        sortable
                             prop="createman"
                             label="创建人"
                             align="center"
@@ -477,6 +490,7 @@
                         >
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="createtime"
                             label="创建时间"
                             align="center"
@@ -485,6 +499,7 @@
                         >
                         </el-table-column>
                          <el-table-column
+                         sortable
                             prop="updatetime"
                             label="修改时间"
                             align="center"
@@ -493,6 +508,7 @@
                         >
                         </el-table-column>
                         <el-table-column
+                        sortable
                             prop="updateman"
                             label="修改人"
                             align="center"
@@ -500,6 +516,7 @@
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
+                        sortable
                             prop="memo"
                             label="备注"
                             align="center"
@@ -607,7 +624,6 @@
                 <el-form-item
                  label="规格"
                  prop="specifications"
-                 v-if="filterForm.data.gx != 'XG'"
                 >
                <el-select
                      allow-create
@@ -671,7 +687,7 @@
                     </el-select>
             </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
                 <el-form-item
                 label="高度*宽度(mm)"
                 prop="lengthTimesWidth"
@@ -692,7 +708,7 @@
                     ></el-option>
                     </el-select>
                 </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
                 <el-form-item
                 label="长度(mm)"
@@ -1161,7 +1177,7 @@ export default {
                 that.custom = 0;
             }
         }
-        if (that.$route.query.gx !== 'LG') {
+        if (that.$route.query.gx === 'GX') {
              that.getGrades();
              that.getSpecifications();
              that.getStandards();
@@ -1171,12 +1187,16 @@ export default {
             that.getSpecificationsAsLg();
             that.getStandardsAsLg();
         }
+        if (that.$route.query.gx === 'XG') {
+             that.getGrades();
+             that.getlengthTimesWidth();
+             that.getStandards();
+        }
         that.getNodeData();
         // that.getLocation();
         that.getUnitIdData();
         that.getLocateIdData();
         // that.getTableData();
-        that.getlengthTimesWidth();
     },
     methods: {
         //  计算树区域高度
@@ -1344,10 +1364,10 @@ export default {
                     }
                 });
         },
-        // 获取型钢宽度*长度
+        // 获取型钢规格
         getlengthTimesWidth () {
             let that = this
-            let url = 'pass/ems/v1/emsprodplanrounds/getlengthTimesWidth';
+            let url = 'pass/ems/v1/emsprodplanrounds/getbasespecbillet';
             that.axios.get(url)
                 .then(function (res) {
                     if (res.code === '0') {
@@ -1356,12 +1376,11 @@ export default {
                         for (let item of res.data) {
                             arr.push({
                                 id: item.id,
-                                name: item.lengthTimesWidth
+                                name: item.specifications
                             })
                         }
-                        that.nameObj.lengthTimeswidth.arr = arr;
-                        that.nameObj.lengthTimeswidth.obj = obj;
-                        console.log(that.nameObj.lengthTimeswidth);
+                        that.nameObj.specifications.arr = arr;
+                        that.nameObj.specifications.obj = obj;
                     } else {
                         that.$message.error(res.message);
                     }

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

@@ -147,27 +147,31 @@
                             prop="id"
                             label="编号"
                             fixed="left"
-                            width="136px"
+                            width="118px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                            sortable
                             prop="jhTime"
                             label="排产日期"
-                            width="80px"
+                            align="center"
+                            width="76px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                            sortable
                             prop="deliveryDate"
                             label="交货日期"
+                            align="center"
                             width="80px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                         sortable
                         prop="grades"
+                        align="center"
                         label="钢种"
+                         width="71px"
                         :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -175,45 +179,50 @@
                         sortable
                         prop="specifications"
                         label="规格"
-                        width="120px"
+                        align="center"
+                        width="84px"
                         :show-overflow-tooltip="true"
                         >
-                            </el-table-column>
+                        </el-table-column>
                         <el-table-column
                         sortable
                             prop="planweight"
                             label="计划量"
-                            width="110px"
+                            width="80px"
+                            align="center"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="kxf_weight"
-                                    label="可下发量"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="yxf_weight"
-                                    label="已下发量"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                </el-table-column>
-                                <el-table-column
-                                sortable
-                                prop="workprocType"
-                                label="工序"
-                                min-width="100px"
-                                :show-overflow-tooltip="true"
-                                >
-                                <template slot-scope="scope">
-                                                <span>{{ nameObj.workprocid.obj[scope.row.workprocType] ? nameObj.workprocid.obj[scope.row.workprocType].name : scope.row.workprocType }}</span>
-                                            </template>
-                                </el-table-column>
+                        <el-table-column
+                        sortable
+                        prop="kxf_weight"
+                        label="可下发量"
+                        min-width="80px"
+                        align="center"
+                        :show-overflow-tooltip="true"
+                        >
+                        </el-table-column>
+                        <el-table-column
+                        sortable
+                        prop="yxf_weight"
+                        label="已下发量"
+                        min-width="80px"
+                        align="center"
+                        :show-overflow-tooltip="true"
+                        >
+                      </el-table-column>
+                        <el-table-column
+                        sortable
+                        prop="workprocType"
+                        label="工序"
+                         min-width="100px"
+                         align="center"
+                        :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                <span>{{ nameObj.workprocid.obj[scope.row.workprocType] ? nameObj.workprocid.obj[scope.row.workprocType].name : scope.row.workprocType }}</span>
+                        </template>
+                        </el-table-column>
                             </el-table>
                         </el-form>
                     </div>
@@ -252,18 +261,20 @@
                                 fixed="left"
                                 class-name="cnspicuous"
                             ></el-table-column>
-                                <el-table-column
+                            <el-table-column
                                 sortable
-                                    prop="roundid"
-                                    label="编号"
-                                    min-width="142px"
-                                    v-model="filterForm.data.sqno"
-                                    :show-overflow-tooltip="true"
-                                ></el-table-column>
+                                prop="roundid"
+                                label="编号"
+                                fixed="left"
+                                min-width="127px"
+                                v-model="filterForm.data.sqno"
+                                :show-overflow-tooltip="true"
+                            ></el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="may"
                                     label="排产日期"
+                                    align="center"
                                     min-width="134px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -284,18 +295,20 @@
                                 <span v-else>{{scope.row.may}}</span>
                                 </template>
                                 </el-table-column>
-                                <el-table-column
+                                <!-- <el-table-column
                                 sortable
                                     prop="deliveryDate"
                                     label="交货日期"
+                                    align="center"
                                     width="80px"
                                     :show-overflow-tooltip="true"
-                                ></el-table-column>
+                                ></el-table-column> -->
                                 <el-table-column
                                 sortable
                                     prop="state"
                                     label="状态"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="70px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -308,7 +321,8 @@
                                 sortable
                                     prop="grades"
                                     label="钢种"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -340,7 +354,8 @@
                                 sortable
                                     prop="specifications"
                                     label="规格"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="109px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -372,7 +387,8 @@
                                 sortable
                                     prop="planWeight"
                                     label="计划量"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="75px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -395,6 +411,7 @@
                                 sortable
                                     prop="transportType"
                                     label="运输方式"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -427,6 +444,7 @@
                                 sortable
                                     prop="purpose"
                                     label="用途"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -459,7 +477,8 @@
                                 sortable
                                     prop="chemicalStandard"
                                     label="化学成份执行标准"
-                                    min-width="130px"
+                                    align="center"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -492,6 +511,7 @@
                                 sortable
                                     prop="describe"
                                     label="轮次描述"
+                                    align="center"
                                     min-width="160px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -515,6 +535,7 @@
                                 sortable
                                     prop="memo"
                                     label="备注"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -538,6 +559,7 @@
                                 sortable
                                     prop="issuedTime"
                                     label="下发时间"
+                                    align="center"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
@@ -545,13 +567,15 @@
                                 sortable
                                     prop="createman"
                                     label="创建人"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="75px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="createtime"
                                     label="创建时间"
+                                    align="center"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
@@ -559,13 +583,15 @@
                                 sortable
                                     prop="updateman"
                                     label="修改人"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="75px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="updatetime"
                                     label="修改时间"
+                                    align="center"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
@@ -1186,7 +1212,7 @@ export default {
                                 deliveryDate: item.DELIVERYDATE,
                                 planweight: item.PLANWEIGHT,
                                 dimension: item.DIMENSION,
-                                kxf_weight: item.KXF_WEIGHT,
+                                kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
                                 yxf_weight: item.YXF_WEIGHT
                             })
                         }

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

@@ -132,21 +132,33 @@
                            sortable
                             prop="id"
                             label="编号"
+                            align="center"
                             fixed="left"
-                            width="136px"
+                            width="118px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                            sortable
                             prop="jhTime"
                             label="排产日期"
+                            align="center"
                             width="80px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
+                        <el-table-column
+                        sortable
+                        prop="deliveryDate"
+                        label="交货日期"
+                        align="center"
+                        width="80px"
+                        :show-overflow-tooltip="true"
+                         ></el-table-column>
                         <el-table-column
                             sortable
                             prop="grades"
+                            align="center"
                             label="钢种"
+                            width="71"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
@@ -154,44 +166,49 @@
                             sortable
                             prop="specifications"
                             label="规格"
-                            width="120px"
+                            align="center"
+                            width="84px"
                             :show-overflow-tooltip="true"
                             v-if="filterForm.data.gx!='XG'"
                             >
                             </el-table-column>
-                                <el-table-column
-                                   sortable
-                                    prop="lengths"
-                                    label="长度"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                </el-table-column>
+                            <el-table-column
+                                sortable
+                                prop="lengths"
+                                align="center"
+                                label="长度"
+                                min-width="72px"
+                                :show-overflow-tooltip="true"
+                            >
+                            </el-table-column>
                         <el-table-column
                         sortable
                             prop="planweight"
+                            align="center"
                             label="计划量"
-                            width="110px"
+                            width="81px"
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="kxf_weight"
-                                    label="可下发量"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="yxf_weight"
-                                    label="已下发量"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                </el-table-column>
-                            </el-table>
+                            <el-table-column
+                            sortable
+                            align="center"
+                             prop="kxf_weight"
+                            label="可下发量"
+                            min-width="81px"
+                            :show-overflow-tooltip="true"
+                        >
+                        </el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="yxf_weight"
+                            align="center"
+                            label="已下发量"
+                            min-width="81px"
+                            :show-overflow-tooltip="true"
+                            >
+                        </el-table-column>
+                        </el-table>
                         </el-form>
                     </div>
                     <div class="table-tuodong" :style="{ height: singleTableHeight + 'px' }"
@@ -233,7 +250,9 @@
                                 sortable
                                     prop="roundid"
                                     label="编号"
-                                    min-width="142px"
+                                    align="center"
+                                    min-width="127px"
+                                    fixed="left"
                                     v-model="filterForm.data.sqno"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
@@ -241,6 +260,7 @@
                                 sortable
                                     prop="may"
                                     label="排产日期"
+                                    align="center"
                                     min-width="134px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -264,7 +284,8 @@
                                 sortable
                                     prop="state"
                                     label="状态"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="75px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -277,7 +298,8 @@
                                 sortable
                                     prop="grades"
                                     label="钢种"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -309,7 +331,8 @@
                                 sortable
                                     prop="specifications"
                                     label="规格"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="109px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -341,7 +364,8 @@
                                 sortable
                                     prop="lengths"
                                     label="长度"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="85px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -364,7 +388,8 @@
                                 sortable
                                     prop="planWeight"
                                     label="计划量"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="75px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -387,7 +412,8 @@
                                     sortable
                                     prop="surfaceStandard"
                                     label="表面质量执行标准"
-                                    min-width="120px"
+                                    align="center"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -419,7 +445,8 @@
                                 sortable
                                     prop="chemicalStandard"
                                     label="化学成份执行标准"
-                                    min-width="120px"
+                                    align="center"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -452,7 +479,8 @@
                                 sortable
                                     prop="goinfo"
                                     label="去向"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="85px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -483,7 +511,8 @@
                                 sortable
                                     prop="describe"
                                     label="轮次描述"
-                                    min-width="160px"
+                                    align="center"
+                                    min-width="146px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -506,6 +535,7 @@
                                 sortable
                                     prop="memo"
                                     label="备注"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -529,6 +559,7 @@
                                 sortable
                                     prop="issuedTime"
                                     label="下发时间"
+                                    align="center"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
@@ -536,7 +567,8 @@
                                 sortable
                                     prop="createman"
                                     label="创建人"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="76px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
@@ -550,19 +582,22 @@
                                 sortable
                                     prop="updateman"
                                     label="修改人"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="76px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="updatetime"
                                     label="修改时间"
+                                    align="center"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
                                     prop="roundid"
                                     label="轮次序号"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                     v-if="filterForm.data.show"
@@ -1151,8 +1186,9 @@ export default {
                                 updatetime: item.UPDATETIME,
                                 memo: item.MEMO,
                                 planweight: item.PLANWEIGHT,
+                                deliveryDate: item.DELIVERYDATE,
                                 dimension: item.DIMENSION,
-                                kxf_weight: item.KXF_WEIGHT,
+                                kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
                                 yxf_weight: item.YXF_WEIGHT
                             })
                         }

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

@@ -133,24 +133,35 @@
                            sortable
                             prop="id"
                             label="编号"
+                            align="center"
                             fixed="left"
-                            width="136px"
+                            width="118px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                            sortable
                             prop="jhTime"
                             label="排产日期"
+                            width="76px"
+                            :show-overflow-tooltip="true"
+                        ></el-table-column>
+                        <el-table-column
+                           sortable
+                            prop="deliveryDate"
+                            label="交货日期"
+                            align="center"
                             width="80px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                                 prop="grades"
                                 label="钢种"
+                                align="center"
+                                width="71px"
                                 :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>
-                            <el-table-column
+                            <!-- <el-table-column
                                 sortable
                                     prop="iateralArea"
                                     label="断面"
@@ -165,12 +176,13 @@
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
-                                </el-table-column>
+                                </el-table-column> -->
                                 <el-table-column
                                 sortable
-                                    prop="lengthTimesWidth"
-                                    label="高度*宽度"
-                                    min-width="100px"
+                                    prop="specifications"
+                                    label="规格"
+                                    align="center"
+                                    min-width="84px"
                                     :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>
@@ -178,14 +190,16 @@
                                     sortable
                                     prop="lengths"
                                     label="长度"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="72px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="planweight"
                                     label="计划量"
-                                    width="110px"
+                                    align="center"
+                                    width="80px"
                                     :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>
@@ -193,7 +207,8 @@
                                 sortable
                                     prop="kxf_weight"
                                     label="可下发量"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="80px"
                                     :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>
@@ -201,7 +216,8 @@
                                 sortable
                                     prop="yxf_weight"
                                     label="已下发量"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="80px"
                                     :show-overflow-tooltip="true"
                                 >
                                 </el-table-column>
@@ -247,13 +263,15 @@
                                 sortable
                                     prop="roundid"
                                     label="编号"
-                                    min-width="142px"
+                                    fixed="left"
+                                    min-width="127px"
                                     v-model="filterForm.data.sqno"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
-                                sortable
+                                    sortable
                                     prop="may"
+                                    align="center"
                                     label="排产日期"
                                     min-width="134px"
                                     :show-overflow-tooltip="true"
@@ -276,8 +294,9 @@
                                 </template>
                                 </el-table-column>
                                 <el-table-column
-                                sortable
+                                   sortable
                                     prop="describe"
+                                    align="center"
                                     label="轮次描述"
                                     min-width="160px"
                                     :show-overflow-tooltip="true"
@@ -301,8 +320,9 @@
                                 <el-table-column
                                 sortable
                                     prop="state"
+                                    align="center"
                                     label="状态"
-                                    min-width="100px"
+                                    min-width="70px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -315,7 +335,7 @@
                                 sortable
                                     prop="grades"
                                     label="钢种"
-                                    min-width="100px"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -342,11 +362,45 @@
                                 </el-form-item>
                                 <span v-else>{{ nameObj.grades.obj[scope.row.grades] ?  nameObj.grades.obj[scope.row.grades].name : scope.row.grades }}</span>
                                 </template>
+                                </el-table-column>
+                                <el-table-column
+                                sortable
+                                    prop="specifications"
+                                    label="规格"
+                                    align="center"
+                                    min-width="109px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                <template slot-scope="scope">
+                                <el-form-item
+                                 :prop="scope.row.seq + '.specifications'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 :rules="tableFormRules.specifications"
+                                >
+                                    <el-select
+                                    allow-create
+                                    filterable
+                                    clearable
+                                    v-model="rightTableObj[scope.row.seq].specifications"
+                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
+                                    placeholder=""
+                                    >
+                                    <el-option
+                                    v-for="item of nameObj.specifications.arr"
+                                    :key="item.id"
+                                    :value="item.name"
+                                    :label="item.name"
+                                    ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <span v-else>{{ nameObj.specifications.obj[scope.row.specifications] ? nameObj.specifications.obj[scope.row.specifications].name : scope.row.specifications }}</span>
+                               </template>
                                 </el-table-column>
                                 <el-table-column
                                     sortable
                                     prop="lengths"
                                     label="长度"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -370,7 +424,8 @@
                                 sortable
                                     prop="planWeight"
                                     label="计划量"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="75px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -389,7 +444,7 @@
                                 <span v-else>{{scope.row.planWeight}}</span>
                             </template>
                                 </el-table-column>
-                                <el-table-column
+                                <!-- <el-table-column
                                 sortable
                                     prop="iateralArea"
                                     label="断面"
@@ -420,8 +475,8 @@
                                 </el-form-item>
                                 <span v-else>{{ nameObj.iateralArea.obj[scope.row.iateralArea] ? nameObj.iateralArea.obj[scope.row.iateralArea].name : scope.row.iateralArea }}</span>
                                </template>
-                                </el-table-column>
-                                <el-table-column
+                                </el-table-column> -->
+                                <!-- <el-table-column
                                 sortable
                                     prop="dimension"
                                     label="截面尺寸"
@@ -434,12 +489,6 @@
                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
                                   :rules="tableFormRules.dimension"
                                 >
-                                    <!-- <el-input
-                                    style="width: 100%;"
-                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
-                                    v-model="rightTableObj[scope.row.seq].dimension"
-                                    refcous="true"
-                                    ></el-input> -->
                                     <el-select
                                     allow-create
                                     filterable
@@ -458,39 +507,7 @@
                                 </el-form-item>
                                 <span v-else>{{ nameObj.dimension.obj[scope.row.dimension] ? nameObj.dimension.obj[scope.row.dimension].name : scope.row.dimension }}</span>
                                </template>
-                                </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="lengthTimesWidth"
-                                    label="高度*宽度"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                <template slot-scope="scope">
-                                <el-form-item
-                                 :prop="scope.row.seq + '.lengthTimesWidth'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                 :rules="tableFormRules.lengthTimesWidth"
-                                >
-                                    <el-select
-                                    allow-create
-                                    filterable
-                                    clearable
-                                    v-model="rightTableObj[scope.row.seq].lengthTimesWidth"
-                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
-                                    placeholder=""
-                                    >
-                                    <el-option
-                                    v-for="item of nameObj.lengthTimeswidth.arr"
-                                    :key="item.id"
-                                    :value="item.name"
-                                    :label="item.name"
-                                    ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <span v-else>{{ nameObj.lengthTimeswidth.obj[scope.row.lengthTimesWidth] ? nameObj.lengthTimeswidth.obj[scope.row.lengthTimesWidth].name : scope.row.lengthTimesWidth }}</span>
-                               </template>
-                                </el-table-column>
+                                </el-table-column> -->
                                 <el-table-column
                                 sortable
                                     prop="transportType"
@@ -527,7 +544,8 @@
                                 sortable
                                     prop="chemicalStandard"
                                     label="化学成份执行标准"
-                                    min-width="120px"
+                                    align="center"
+                                    min-width="126px"
                                     :show-overflow-tooltip="true"
                                 >
                                 <template slot-scope="scope">
@@ -560,6 +578,7 @@
                                 sortable
                                     prop="memo"
                                     label="备注"
+                                    align="center"
                                     min-width="100px"
                                     :show-overflow-tooltip="true"
                                 >
@@ -582,6 +601,7 @@
                                 <el-table-column
                                 sortable
                                     prop="issuedTime"
+                                    align="center"
                                     label="下发时间"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
@@ -590,13 +610,15 @@
                                 sortable
                                     prop="createman"
                                     label="创建人"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="76px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="createtime"
                                     label="创建时间"
+                                    align="center"
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
@@ -604,7 +626,8 @@
                                 sortable
                                     prop="updateman"
                                     label="修改人"
-                                    min-width="100px"
+                                    align="center"
+                                    min-width="76px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
@@ -1122,7 +1145,7 @@ export default {
         // 获取高度和宽度
         getlengthTimesWidth () {
             let that = this
-            let url = 'pass/ems/v1/emsprodplanrounds/getlengthTimesWidth';
+            let url = 'pass/ems/v1/emsprodplanrounds/getbasespecbillet';
             that.axios.get(url)
                 .then(function (res) {
                     if (res.code === '0') {
@@ -1131,12 +1154,11 @@ export default {
                         for (let item of res.data) {
                             arr.push({
                                 id: item.id,
-                                name: item.lengthTimesWidth
+                                name: item.specifications
                             })
                         }
-                        that.nameObj.lengthTimeswidth.arr = arr;
-                        that.nameObj.lengthTimeswidth.obj = obj;
-                        console.log(that.nameObj.lengthTimeswidth);
+                        that.nameObj.specifications.arr = arr;
+                        that.nameObj.specifications.obj = obj;
                     } else {
                         that.$message.error(res.message);
                     }
@@ -1276,10 +1298,11 @@ export default {
                                 updateman: item.UPDATEMAN,
                                 purpose: item.PURPOSE,
                                 updatetime: item.UPDATETIME,
+                                deliveryDate: item.DELIVERYDATE,
                                 memo: item.MEMO,
                                 planweight: item.PLANWEIGHT,
                                 dimension: item.DIMENSION,
-                                kxf_weight: item.KXF_WEIGHT,
+                                kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
                                 yxf_weight: item.YXF_WEIGHT
                             })
                         }

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

@@ -69,7 +69,7 @@
                                     <el-button
                                     type="danger"
                                     size="mini"
-                                    v-privilege="activeMenu + 'approve'"
+                                    v-privilege="activeMenu + 'NOAGREE'"
                                     @click="nopass()"
                                     >不通过</el-button>
                                     <el-button
@@ -226,7 +226,6 @@
                             type="selection"
                             width="40"
                             align="center"
-                            :selectable='checkboxT'
                             fixed="left"
                             class-name="cnspicuous"
                         ></el-table-column>
@@ -269,6 +268,20 @@
                             width="88px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
+                        <el-table-column
+                         sortable
+                            prop="state"
+                            label="审核状态"
+                            align="center"
+                            width="88px"
+                            :show-overflow-tooltip="true"
+                        >
+                         <template slot-scope="scope">
+                                <span
+                                    :style="{color: nameObj.state.obj[scope.row.state] ? nameObj.state.obj[scope.row.state].color : ''}"
+                                >{{ nameObj.state.obj[scope.row.state] ? nameObj.state.obj[scope.row.state].name : scope.row.state }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                         sortable
                             prop="grades"
@@ -299,7 +312,7 @@
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                         sortable
                             prop="lengthtimesWidth"
                             label="高度*宽度"
@@ -307,7 +320,7 @@
                             width="110px"
                             :show-overflow-tooltip="true"
                         >
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column
                         sortable
                             prop="planweight"
@@ -318,7 +331,7 @@
                         >
                         <template slot-scope="scope">
                                 <el-form-item
-                                    v-if="!isCheck && scope.row.isSelection"
+                                    v-if="scope.row.state === '0' && scope.row.isSelection"
                                     :prop="scope.row.seq + '.planweight'"
                                     :rules="tableFormRules.planWeight"
                                 >
@@ -403,20 +416,6 @@
                             width="120px"
                             :show-overflow-tooltip="true"
                         >
-                        </el-table-column>
-                         <el-table-column
-                         sortable
-                            prop="state"
-                            label="审核状态"
-                            align="center"
-                            width="88px"
-                            :show-overflow-tooltip="true"
-                        >
-                         <template slot-scope="scope">
-                                <span
-                                    :style="{color: nameObj.state.obj[scope.row.state] ? nameObj.state.obj[scope.row.state].color : ''}"
-                                >{{ nameObj.state.obj[scope.row.state] ? nameObj.state.obj[scope.row.state].name : scope.row.state }}</span>
-                        </template>
                         </el-table-column>
                         <!-- <el-table-column
                         class-name="gn-TableDownloadExcel-none"
@@ -593,7 +592,7 @@ export default {
                             color: 'rgb(28, 111, 217)'
                         },
                         {
-                            name: '部门领导已批准',
+                            name: '国贸已批准',
                             color: 'rgb(28, 111, 217)'
                         },
                         {