应急标识改为订单类型

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

@@ -204,7 +204,7 @@
                         <el-table-column
                         sortable
                             prop="tag"
-                            label="应急标识"
+                            label="订单类型"
                             align="center"
                             fixed="left"
                             width="88px"

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

@@ -81,7 +81,7 @@
                       </el-col>
                       <el-col :span="3"
                       >
-                          <el-form-item label="应急标识">
+                          <el-form-item label="订单类型">
                             <el-select
                             filterable clearable
                             v-model="filterForm.data.tag"
@@ -297,7 +297,7 @@
                         <el-table-column
                         sortable
                             prop="tag"
-                            label="应急标识"
+                            label="订单类型"
                             align="center"
                             fixed="left"
                             width="88px"
@@ -797,7 +797,7 @@
         <el-row>
           <el-col :span="12">
            <el-form-item
-           label="应急标识"
+           label="订单类型"
            prop="tag"
                >
           <el-select

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

@@ -237,21 +237,20 @@
                         width="84px"
                         :show-overflow-tooltip="true"
                         >
-                        </el-table-column>
-                        <el-table-column
-                        sortable
-                            prop="tag"
-                            label="应急标识"
-                            align="center"
-                            fixed="left"
-                            width="88px"
-                            :show-overflow-tooltip="true"
-                        >
-                         <template slot-scope="scope">
-                                <span
-                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
-                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
-                        </template>
+                        </el-table-column>
+                        <el-table-column
+                        sortable
+                            prop="tag"
+                            label="订单类型"
+                            align="center"
+                            width="88px"
+                            :show-overflow-tooltip="true"
+                        >
+                         <template slot-scope="scope">
+                                <span
+                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
+                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
+                        </template>
                         </el-table-column>
                         <el-table-column
                         sortable
@@ -412,6 +411,20 @@
                                  </template>
                                 </el-table-column>
                                 <el-table-column
+                                sortable
+                                    prop="tag"
+                                    align="center"
+                                    label="订单类型"
+                                    min-width="70px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                <template slot-scope="scope">
+                                <span
+                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
+                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
+                                 </template>
+                                </el-table-column>
+                                <el-table-column
                                 sortable
                                     prop="grades"
                                     label="钢种"
@@ -1020,28 +1033,28 @@ export default {
                             name: '钢丝、弹簧'
                         }
                     ]
-                },
-                tag: {
-                    obj: {
-                        '0': {
-                            name: '正常',
-                            color: '#7a7a7a'
-                        },
-                        '1': {
-                            name: '应急',
-                            color: 'red'
-                        }
-                    },
-                    arr: [
-                        {
-                            id: '0',
-                            name: '正常'
-                        },
-                        {
-                            id: '1',
-                            name: '应急'
-                        }
-                    ]
+                },
+                tag: {
+                    obj: {
+                        '0': {
+                            name: '正常',
+                            color: '#7a7a7a'
+                        },
+                        '1': {
+                            name: '应急',
+                            color: 'red'
+                        }
+                    },
+                    arr: [
+                        {
+                            id: '0',
+                            name: '正常'
+                        },
+                        {
+                            id: '1',
+                            name: '应急'
+                        }
+                    ]
                 }
             },
             loading: false,
@@ -1316,7 +1329,7 @@ export default {
                                 planweight: item.PLANWEIGHT,
                                 dimension: item.DIMENSION,
                                 kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
-                                yxf_weight: item.YXF_WEIGHT,
+                                yxf_weight: item.YXF_WEIGHT,
                                 tag: item.TAG ? item.TAG : '0'
                             })
                         }
@@ -1337,7 +1350,7 @@ export default {
             if (that.leftTableShow == true){
                that.getTableDetailDatas(that.pageNum);
             } else {
-               that.getTableDetailAsRadio(that.pageNum) 
+               that.getTableDetailAsRadio(that.pageNum)
             }
         },
         // 改变表格显示条数
@@ -1388,7 +1401,8 @@ export default {
                     deliveryDate: item.deliveryDate,
                     sqno: item.sqno,
                     workprocType: item.workprocType,
-                    auditState: item.auditState
+                    auditState: item.auditState,
+                    tag: item.tag ? item.tag : '0'
                  });
                     }
                     that.rightTableData = arr;
@@ -1501,7 +1515,8 @@ export default {
                     sqno: item.sqno,
                     updatetime: item.updatetime,
                     workprocType: item.workprocType,
-                    auditState: item.auditState
+                    auditState: item.auditState,
+                    tag: item.tag
                  });
                     }
                     that.rightTableData = arr;
@@ -2066,7 +2081,8 @@ export default {
                         planweight: that.tableFormDataObj[key].planweight,
                         createTime: that.tableFormDataObj[key].createtime,
                         deliveryDate: that.tableFormDataObj[key].deliveryDate,
-                        auditState: '0'
+                        auditState: '0',
+                        tag: that.tableFormDataObj[key].tag ? that.tableFormDataObj[key].tag : '0'
                   })
 				  }
                     that.loading = true;

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

@@ -188,22 +188,7 @@
                             fixed="left"
                             width="148px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
-                        <el-table-column
-                        sortable
-                            prop="tag"
-                            label="应急标识"
-                            align="center"
-                            fixed="left"
-                            width="88px"
-                            :show-overflow-tooltip="true"
-                        >
-                         <template slot-scope="scope">
-                                <span
-                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
-                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
-                        </template>
-                        </el-table-column>
+                        ></el-table-column>
                         <el-table-column
                            sortable
                             prop="jhTime"
@@ -247,7 +232,21 @@
                                 min-width="72px"
                                 :show-overflow-tooltip="true"
                             >
-                            </el-table-column>
+                          </el-table-column>
+                        <el-table-column
+                        sortable
+                            prop="tag"
+                            label="订单类型"
+                            align="center"
+                            width="88px"
+                            :show-overflow-tooltip="true"
+                        >
+                        <template slot-scope="scope">
+                                <span
+                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
+                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
+                        </template>
+                        </el-table-column>
                         <el-table-column
                         sortable
                             prop="planweight"
@@ -388,6 +387,20 @@
                                  </template>
                                 </el-table-column>
                                 <el-table-column
+                                sortable
+                                    prop="tag"
+                                    align="center"
+                                    label="订单类型"
+                                    min-width="70px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                <template slot-scope="scope">
+                                <span
+                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
+                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
+                                 </template>
+                                </el-table-column>
+                                <el-table-column
                                 sortable
                                     prop="grades"
                                     label="钢种"
@@ -1047,6 +1060,28 @@ export default {
                             name: '铁丝'
                         }
                     ]
+                },
+                tag: {
+                    obj: {
+                        '0': {
+                            name: '正常',
+                            color: '#7a7a7a'
+                        },
+                        '1': {
+                            name: '应急',
+                            color: 'red'
+                        }
+                    },
+                    arr: [
+                        {
+                            id: '0',
+                            name: '正常'
+                        },
+                        {
+                            id: '1',
+                            name: '应急'
+                        }
+                    ]
                 }
             },
             loading: false,
@@ -1355,7 +1390,7 @@ export default {
                                 deliveryDate: item.DELIVERYDATE,
                                 dimension: item.DIMENSION,
                                 kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
-                                yxf_weight: item.YXF_WEIGHT,
+                                yxf_weight: item.YXF_WEIGHT,
                                 tag: item.TAG ? item.TAG : '0'
                             })
                         }
@@ -1427,7 +1462,8 @@ export default {
                     workprocType: item.workprocType,
                     lengths: item.lengths,
                     surfaceStandard: item.surfaceStandard,
-                    goinfo: item.goinfo
+                    goinfo: item.goinfo,
+                    tag: item.tag ? item.tag : '0'
                  });
                     }
                     that.rightTableData = arr;
@@ -1513,7 +1549,8 @@ export default {
                     workprocType: item.workprocType,
                     lengths: item.lengths,
                     surfaceStandard: item.surfaceStandard,
-                    goinfo: item.goinfo
+                    goinfo: item.goinfo,
+                    tag: item.tag
                  });
                     }
                     that.rightTableData = arr;
@@ -1987,7 +2024,7 @@ export default {
             let SubmitData = {
                 jhTime: that.dialog.editorBox.form.data.may,
                 planWeight: that.dialog.editorBox.form.data.planWeight,
-                workprocType: that.filterForm.data.workproc_type,
+                workprocType: that.filterForm.data.workproc_type,
                 tag: '0'
             };
             that.$refs['dialog_form'].validate((valid) => {
@@ -2122,7 +2159,8 @@ export default {
                         lengths: that.tableFormDataObj[key].lengths,
                         goinfo: that.tableFormDataObj[key].id.substring(0, 1) === 'G' ? '1036WM1' : null,
                         surfaceStandard: that.tableFormDataObj[key].surfaceStandard,
-                        type: type
+                        type: type,
+                        tag: that.tableFormDataObj[key].tag ? that.tableFormDataObj[key].tag : '0'
                   })
                   }
                     that.loading = true;

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

@@ -195,22 +195,7 @@
                             label="排产日期"
                             width="97px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
-                        <el-table-column
-                        sortable
-                            prop="tag"
-                            label="应急标识"
-                            align="center"
-                            fixed="left"
-                            width="88px"
-                            :show-overflow-tooltip="true"
-                        >
-                         <template slot-scope="scope">
-                                <span
-                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
-                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
-                        </template>
-                        </el-table-column>
+                        ></el-table-column>
                         <el-table-column
                            sortable
                             prop="deliveryDate"
@@ -261,6 +246,20 @@
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
                                 <el-table-column
+                                sortable
+                                    prop="tag"
+                                    label="订单类型"
+                                    align="center"
+                                    width="88px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                 <template slot-scope="scope">
+                                        <span
+                                            :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
+                                        >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
+                                </template>
+                                </el-table-column>
+                                <el-table-column
                                 sortable
                                     prop="planweight"
                                     label="计划量"
@@ -405,6 +404,20 @@
                                  </template>
                                 </el-table-column>
                                 <el-table-column
+                                sortable
+                                    prop="tag"
+                                    align="center"
+                                    label="订单类型"
+                                    min-width="70px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                <template slot-scope="scope">
+                                <span
+                                    :style="{color: nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].color : ''}"
+                                >{{ nameObj.tag.obj[scope.row.tag] ? nameObj.tag.obj[scope.row.tag].name : scope.row.tag }}</span>
+                                 </template>
+                                </el-table-column>
+                                <el-table-column
                                 sortable
                                     prop="grades"
                                     label="钢种"
@@ -1039,6 +1052,28 @@ export default {
                             name: '铁丝'
                         }
                     ]
+                },
+                tag: {
+                    obj: {
+                        '0': {
+                            name: '正常',
+                            color: '#7a7a7a'
+                        },
+                        '1': {
+                            name: '应急',
+                            color: 'red'
+                        }
+                    },
+                    arr: [
+                        {
+                            id: '0',
+                            name: '正常'
+                        },
+                        {
+                            id: '1',
+                            name: '应急'
+                        }
+                    ]
                 }
             },
             loading: false,
@@ -1381,7 +1416,7 @@ export default {
                                 planweight: item.PLANWEIGHT,
                                 dimension: item.DIMENSION,
                                 kxf_weight: item.PLANWEIGHT - item.YXF_WEIGHT,
-                                yxf_weight: item.YXF_WEIGHT,
+                                yxf_weight: item.YXF_WEIGHT,
                                 tag: item.TAG ? item.TAG : '0'
                             })
                         }
@@ -1402,7 +1437,7 @@ export default {
             if (that.leftTableShow == true){
                that.getTableDetailDatas(that.pageNum);
             } else {
-               that.getTableDetailAsRadio(that.pageNum) 
+               that.getTableDetailAsRadio(that.pageNum)
             }
         },
         // 改变表格显示条数
@@ -1454,7 +1489,8 @@ export default {
                     lengthTimesWidth: item.lengthTimesWidth,
                     dimension: item.dimension,
                     iateralArea: item.iateralArea,
-                    lengths: item.lengths
+                    lengths: item.lengths,
+                    tag: item.tag ? item.tag : '0'
                  });
                     }
                     that.rightTableData = arr;
@@ -1516,7 +1552,8 @@ export default {
                     lengthTimesWidth: item.lengthTimesWidth,
                     dimension: item.dimension,
                     iateralArea: item.iateralArea,
-                    lengths: item.lengths
+                    lengths: item.lengths,
+                    tag: item.tag
                  });
                     }
                     that.rightTableData = arr;
@@ -2131,7 +2168,8 @@ export default {
                         planweight: that.tableFormDataObj[key].planweight,
                         iateralArea: that.tableFormDataObj[key].iateralArea,
                         lengths: that.tableFormDataObj[key].lengths,
-                        type: type
+                        type: type,
+                        tag: that.tableFormDataObj[key].tag ? that.tableFormDataObj[key].tag : '0'
                   })
                   }
                     that.loading = true;