lrl -2021-12-24

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

@@ -709,8 +709,8 @@ export default {
                              id: 'AT3024',
                            name: '焦油'
                         },
-                        'AT3009': {
-                            id: 'AT3009',
+                        'AT2011': {
+                            id: 'AT2011',
                           name: '粗苯'
                          },
                         'AT3010': {
@@ -722,7 +722,7 @@ export default {
                            name: '焦油'
                         },
                         {
-                          id: 'AT3009',
+                          id: 'AT2011',
                           name: '粗苯'
                         },
                         {

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

@@ -216,8 +216,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2005']"
-                                        v-if="!isNaN(Number(itemform['AT2005']))"
+                                        v-model="itemform['AT2005-1']"
+                                        v-if="!isNaN(Number(itemform['AT2005-1']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -229,7 +229,7 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2005']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2005-1']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -246,8 +246,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2006']"
-                                        v-if="!isNaN(Number(itemform['AT2006']))"
+                                        v-model="itemform['AT2006-1']"
+                                        v-if="!isNaN(Number(itemform['AT2006-1']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -259,7 +259,7 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2006']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2006-1']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -276,8 +276,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT2007']"
-                                        v-if="!isNaN(Number(itemform['AT2007']))"
+                                        v-model="itemform['AT2007-1']"
+                                        v-if="!isNaN(Number(itemform['AT2007-1']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -289,7 +289,7 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2007']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT2007-1']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -306,8 +306,8 @@
                                     <el-input clearable
                                         v-for="(itemform, key) in tableFormDataObj[scope.row.seq].weight"
                                         style="width: 100%;"
-                                        v-model="itemform['AT3008']"
-                                        v-if="!isNaN(Number(itemform['AT3008']))"
+                                        v-model="itemform['AT3008-1']"
+                                        v-if="!isNaN(Number(itemform['AT3008-1']))"
                                         refcous="true"
                                         :rules="tableFormRules.weight"
                                         oninput="this.value = this.value.replace(/[^\d.]/g,'');"
@@ -319,7 +319,7 @@
                                         <p class="error" :title="scope.error">{{ scope.error }}</p>
                                     </template>
                                 </el-form-item>
-                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT3008']}}</span>
+                                <span v-else v-for="(item, index) in tableData[scope.row.index].weight" :key="index">{{item['AT3008-1']}}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
@@ -724,8 +724,8 @@ export default {
                 workprocid: {
                     obj: {
                         'AT2005': {
-                            id: 'AT2005',
-                          name: '供高线一车间'
+                                id: 'AT2005',
+                            name: '供高线一车间'
                          },
                          'AT2006': {
                              id: 'AT2006',
@@ -745,7 +745,7 @@ export default {
                         name: '供高线一车间'
                         },
                         {
-                         id: 'AT2006',
+                         id: 'AT2006-1',
                         name: '供高线二车间'
                        },
                        {
@@ -759,37 +759,37 @@ export default {
                 },
                 line: {
                     obj: {
-                        'AT2005': {
-                            id: 'AT2005',
+                        'AT2005-1': {
+                            id: 'AT2005-1',
                           name: '供高线一车间'
                          },
-                         'AT2006': {
-                             id: 'AT2006',
+                         'AT2006-1': {
+                             id: 'AT2006-1',
                            name: '供高线二车间'
                         },
-                        'AT2007': {
-                             id: 'AT2007',
+                        'AT2007-1': {
+                             id: 'AT2007-1',
                            name: '供型钢厂异形坯'
                         },
-                        'AT3008': {
-                             id: 'AT3008',
+                        'AT3008-1': {
+                             id: 'AT3008-1',
                            name: '外销方坯'
                         }
                          },
                     arr: [{
-                        id: 'AT2005',
+                        id: 'AT2005-1',
                         name: '供高线一车间'
                         },
                         {
-                         id: 'AT2006',
+                         id: 'AT2006-1',
                         name: '供高线二车间'
                        },
                        {
-                           id: 'AT2007',
+                           id: 'AT2007-1',
                            name: '供型钢厂异形坯'
                        },
                        {
-                           id: 'AT3008',
+                           id: 'AT3008-1',
                            name: '外销方坯'
                        }]
                 },
@@ -935,25 +935,25 @@ export default {
                 switch (0) {
                     case index % 8:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT3008']) ? 0 : item['AT3008']);
+                        weiItem = (isNaN(item['AT3008-1']) ? 0 : item['AT3008-1']);
                         lineTotal += Number(weiItem);
                     });
                     break;
                     case index % 7:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT2007']) ? 0 : item['AT2007']);
+                        weiItem = (isNaN(item['AT2007-1']) ? 0 : item['AT2007-1']);
                         lineTotal += Number(weiItem);
                     });
                     break;
                     case index % 6:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT2006']) ? 0 : item['AT2006']);
+                        weiItem = (isNaN(item['AT2006-1']) ? 0 : item['AT2006-1']);
                         lineTotal += Number(weiItem);
                     });
                     break;
                     default:
                     that.tableData[i].weight.forEach((item, key) => {
-                        weiItem = (isNaN(item['AT2005']) ? 0 : item['AT2005']);
+                        weiItem = (isNaN(item['AT2005-1']) ? 0 : item['AT2005-1']);
                         lineTotal += Number(weiItem);
                     });
                     break;
@@ -1695,6 +1695,9 @@ export default {
     but_add () {
             let that = this;
             that.dialog.editorBox.show = true;
+            that.dialog.editorBox.form.data.weight = '',
+            that.dialog.editorBox.form.data.line = '',
+            that.dialog.editorBox.form.data.memo = ''
              setTimeout(() => {
                 that.$refs['dialog_form'].clearValidate();
             }, 100);

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

@@ -86,6 +86,14 @@
                             v-privilege="activeMenu + 'ADD'"
                             @click="but_add(1)"
                         >新增子计划</el-button>
+                        <el-select v-model ="filterForm.data.options" clearable @change="getTableData()" size="mini">
+                            <el-option
+                            v-for="item of options.arr"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
                      <div style="float:right; text-align: right;">
                         <el-radio-group v-model="radio" @change="radioChange()">
                             <el-radio :label="0">
@@ -831,8 +839,13 @@ export default {
                     parentid: '',
                     purpose: '',
                     sqno: '',
-                    show: false
+                    show: false,
+                    options: ''
                 }
+            },
+            options: {
+                obj:{'2':{id:'2',name:"已下发"},'3':{id:'3',name:"已接收"}},
+                arr: [{id:'2',name:'已下发'},{id:'3',name:'已接收'}]
             },
              rules: {
                 },
@@ -1227,7 +1240,8 @@ export default {
                    endTime: that.filterForm.data.clock[1],
                    id: that.filterForm.data.Gmid,
                    grades: that.filterForm.data.grades.join(','),
-                   specifications: that.filterForm.data.specifications.join(',')
+                   specifications: that.filterForm.data.specifications.join(','),
+                   state: that.filterForm.data.options
                 };
              that.pageNum1 = pageNum1 || that.pageNum1;
             that.leftTableLoading = true;

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

@@ -1524,7 +1524,7 @@ export default {
             let that = this;
             let SubmitData = [];
             SubmitData.push({
-               yearmonth: that.dialog.editorBox.form.data.yearmonth,
+                yearmonth: that.dialog.editorBox.form.data.yearmonth,
                 weight: that.dialog.editorBox.form.data.weight,
                 unit: that.dialog.editorBox.form.data.unitid,
                 line: that.dialog.editorBox.form.data.line,
@@ -1649,6 +1649,9 @@ export default {
         },
     but_add () {
             let that = this;
+            that.dialog.editorBox.form.data.weight = '',
+            that.dialog.editorBox.form.data.line = '',
+            that.dialog.editorBox.form.data.memo = ''
             that.dialog.editorBox.show = true;
              setTimeout(() => {
                 that.$refs['dialog_form'].clearValidate();