lrl-2021-11-08

package.json

@@ -15,7 +15,7 @@
     "testc": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/icore-icp/build/webpack.test.conf.js --require node_modules/icore-icp/test/setup.js node_modules/icore-icp/test/**/*.spec.js"
   },
   "dependencies": {
-    "icore-icp": "^1.0.0-at.1.3"
+    "icore-icp": "^1.2.2-at.1.7" 
   },
   "devDependencies": {
     "@vue/test-utils": "^1.0.0-beta.24",

src/views/energyBalance/components/foldvalue.vue

@@ -1,5 +1,5 @@
 <template>
-<!-- 折算系数维护 -->
+<!-- 折算值维护 -->
     <div class="sourcecode">
         <div class="box">
             <div class="box-top">
@@ -30,17 +30,43 @@
                             </el-form-item>
                         </el-col> -->
                         <el-col :span="6">
-                            <el-form-item label="公式版本">
-                                <el-date-picker
+                            <el-form-item label="检测日期">
+                                <!-- <el-date-picker
                                     v-model="filterForm.data.clock"
                                     type="date"
                                     placeholder=""
                                     style="width: 100%;"
                                     value-format="yyyyMMdd"
-                                ></el-date-picker>
+                                    :custom ="1"
+                                ></el-date-picker> -->
+                                <zj-timegran-date
+                                    v-model="filterForm.data.clock"
+                                    style="width: 100%;"
+                                    :type="'daterange'"
+                                    :oneFoo="getTableData"
+                                    :timegranId="filterForm.data.timegranid"
+                                    :custom ="1"
+                                ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
                         <el-col :span="6">
+                            <el-form-item label="时间粒度">
+                                <el-select
+                                    filterable clearable
+                                    v-model="filterForm.data.timegranid"
+                                    placeholder=""
+                                    style="width: 100%;"
+                                >
+                                    <el-option
+                                        v-for="item of nameObj.timegranid.arr"
+                                        :key="item.id"
+                                        :value="item.id"
+                                        :label="item.name"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <!-- <el-col :span="6">
                             <el-form-item label="能介编码">
                                 <el-input clearable
                                     v-model.trim="filterForm.data.energyid"
@@ -48,17 +74,17 @@
                                     style="width: 100%;"
                                 ></el-input>
                             </el-form-item>
-                        </el-col>
+                        </el-col> -->
                     </el-row>
                 </el-form>
                 <div class="box-top-gjl">
-                    <el-button
+                    <!-- <el-button
                         class="button"
                         type="primary"
                         size="mini"
                         icon="el-icon-save"
                         @click="but_more()"
-                    >保存</el-button>
+                    >保存</el-button> -->
                     <div style="float:right; text-align: right;">
                         <el-button
                             class="button"
@@ -68,14 +94,14 @@
                             v-privilege="activeMenu + 'QUERY'"
                             @click="getTableData(1)"
                         >查询</el-button>
-                        <el-button
+                        <!-- <el-button
                             class="button"
                             type="primary"
                             size="mini"
                             icon="el-icon-refresh"
                             v-privilege="activeMenu + 'QUERY'"
                             @click="tableDataCancel();"
-                        >重置</el-button>
+                        >重置</el-button> -->
                         <el-button
                             size="mini"
                             :icon="filterForm.show ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
@@ -108,14 +134,14 @@
                         highlight-current-row
                         @selection-change="handleSelectionChange">
                     >
-                        <el-table-column
+                        <!-- <el-table-column
                             sortable
                             type="selection"
                             width="40"
                             align="center"
                             fixed="left"
                         >
-                        </el-table-column>
+                        </el-table-column> -->
                         <el-table-column
                             prop="id"
                             width="40"
@@ -129,24 +155,26 @@
                             prop="materialsource"
                             label="物料来源"
                             width="100px"
+                            align="center"
                             :show-overflow-tooltip="true"
                         >
                          <template slot-scope="scope">
                               <span>{{ nameObj.materialsource.obj[scope.row.materialsource] ? nameObj.materialsource.obj[scope.row.materialsource].name : scope.row.materialsource }}</span>
                         </template>
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                         sortable
                             prop="energyid"
                             label="能介编码"
                             width="100px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
+                        ></el-table-column> -->
                         <el-table-column
                             sortable
                             :sort-by="function(row, index) { return sortFoo(row, index, 'energyid') }"
                             prop="energyname"
                             label="能介名称"
+                            align="center"
                             width="120px"
                             :show-overflow-tooltip="true"
                         >
@@ -157,14 +185,24 @@
                         <el-table-column
                         sortable
                             prop="clock"
-                            label="公式版本"
+                            label="检测日期"
+                            align="center"
+                            width="100px"
+                            :show-overflow-tooltip="true"
+                        ></el-table-column>
+                        <el-table-column
+                        sortable
+                            prop="estimatedvalue"
+                            label="低热值"
+                            align="center"
                             width="100px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                         sortable
                             prop="code"
-                            label="折标值"
+                            label="折标值/灰分"
+                            align="center"
                             width="125px"
                             :show-overflow-tooltip="true"
                         >
@@ -190,6 +228,7 @@
                             sortable
                             prop="unitid"
                             label="单位"
+                            align="center"
                             width="145px"
                             :show-overflow-tooltip="true"
                         >
@@ -220,6 +259,7 @@
                             sortable
                             prop="description"
                             label="描述"
+                            align="center"
                             width="180px"
                             :show-overflow-tooltip="true"
                         >
@@ -242,6 +282,7 @@
                             sortable
                             prop="bz"
                             label="备注"
+                            align="center"
                             min-width="150px"
                             :show-overflow-tooltip="true"
                         >
@@ -260,7 +301,7 @@
                                 <span v-else>{{scope.row.bz}}</span>
                             </template>
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                             sortable
                             prop="revisor"
                             label="修改人"
@@ -273,7 +314,7 @@
                             label="修改时间"
                             width="125px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
+                        ></el-table-column> -->
                         <!-- <el-table-column
                             class-name="gn-TableDownloadExcel-none"
                             label="操作"
@@ -353,8 +394,12 @@
 
 <script>
 import { zCheckNumber1 } from '~/utils/validator.js'
+import timegranDate from '~/components/zg/timegranDate.vue'
 import { formatDate } from '@/utils/util.js';
 export default {
+     components: {
+        'zj-timegran-date': timegranDate
+    },
     name: 'sourcecode',
     data () {
         return {
@@ -365,7 +410,7 @@ export default {
                 data: {
                     code: '',
                     energyid: '',
-                    timegranid: 'MONTH',
+                    timegranid: 'DAY',
                     clock: formatDate(new Date(), 'yyyyMMdd')
                 },
                 rules: {
@@ -393,6 +438,22 @@ export default {
                     obj: {},
                     arr: []
                 },
+                timegranid: {
+                    obj: {
+                        "DAY": {name: "天"},
+                        "MONTH": {name: "月"}
+                    },
+                    arr: [
+                        {
+                         id: "DAY",
+                         name: "天"
+                        },
+                        {
+                         id: "MONTH",
+                         name: "月"
+                        }
+                    ]
+                },
                 materialsource: {
                     obj: {
                         '1011GL1': {
@@ -561,7 +622,9 @@ export default {
             let that = this,
                 params = {
                     energyid: that.filterForm.data.energyid,
-                    clock: that.filterForm.data.clock
+                    startTime: that.filterForm.data.clock[0],
+                    endTime:that.filterForm.data.clock[1],
+                    timegranid: that.filterForm.data.timegranid
                 };
             that.pageNum = pageNum || that.pageNum;
             that.tableLoading = true;
@@ -580,6 +643,7 @@ export default {
                                 clock: item.CLOCK,
                                 description: item.DESCRIPTION,
                                 code: item.CODE,
+                                estimatedvalue: item.ESTIMATEDVALUE,
                                 isavailable: item.ISAVAILABLE,
                                 revisetime: item.REVISETIME,
                                 materialsource: item.MATERIALSOURCE,
@@ -625,52 +689,52 @@ export default {
             that.dialog.editorBox.type = 'edit';
             that.dialog.editorBox.show = true;
         },
-        but_more () {
-            let that = this;
-            if (that.multipleSelection.length > 0) {
-                that.$refs['dialog_form_arr'].validate((valid) => {
-                    if (valid) {
-                        let SubmitData = [];
-                        for (var name in that.tableFormDataObj) {
-                            SubmitData.push({
-                                id: that.tableFormDataObj[name].id,
-                                code: that.tableFormDataObj[name].code,
-                                clock: that.tableFormDataObj[name].clock,
-                                sourcecode: that.tableFormDataObj[name].sourcecode,
-                                analyzecode: that.tableFormDataObj[name].analyzecode,
-                                description: that.tableFormDataObj[name].description,
-                                isavailable: that.tableFormDataObj[name].isavailable,
-                                materialsource: that.tableFormDataObj[name].materialsource,
-                                revisor: that.tableFormDataObj[name].revisor,
-                                revisetime: that.tableFormDataObj[name].revisetime,
-                                materialno: that.tableFormDataObj[name].materialno,
-                                unitid: that.tableFormDataObj[name].unitid,
-                                bz: that.tableFormDataObj[name].bz
-                            });
-                        }
-                        that.loading = true;
-                        that.axios.put('pass/ems/v1/foldthevaluess/', SubmitData)
-                            .then(function (res) {
-                                if (res.code === '0') {
-                                    that.$message({
-                                        message: '修改成功',
-                                        type: 'success'
-                                    });
-                                    that.getTableData();
-                                    that.dialog.editorBox.show = false;
-                                } else {
-                                    that.$message.error(res.message);
-                                }
-                                that.loading = false;
-                            }).catch(function () {
-                                that.loading = false;
-                            });
-                    } else {
-                        that.$message.error('请输入正确的折标系数');
-                    }
-                });
-            }
-        },
+        // but_more () {
+        //     let that = this;
+        //     if (that.multipleSelection.length > 0) {
+        //         that.$refs['dialog_form_arr'].validate((valid) => {
+        //             if (valid) {
+        //                 let SubmitData = [];
+        //                 for (var name in that.tableFormDataObj) {
+        //                     SubmitData.push({
+        //                         id: that.tableFormDataObj[name].id,
+        //                         code: that.tableFormDataObj[name].code,
+        //                         clock: that.tableFormDataObj[name].clock,
+        //                         sourcecode: that.tableFormDataObj[name].sourcecode,
+        //                         analyzecode: that.tableFormDataObj[name].analyzecode,
+        //                         description: that.tableFormDataObj[name].description,
+        //                         isavailable: that.tableFormDataObj[name].isavailable,
+        //                         materialsource: that.tableFormDataObj[name].materialsource,
+        //                         revisor: that.tableFormDataObj[name].revisor,
+        //                         revisetime: that.tableFormDataObj[name].revisetime,
+        //                         materialno: that.tableFormDataObj[name].materialno,
+        //                         unitid: that.tableFormDataObj[name].unitid,
+        //                         bz: that.tableFormDataObj[name].bz
+        //                     });
+        //                 }
+        //                 that.loading = true;
+        //                 that.axios.put('pass/ems/v1/foldthevaluess/', SubmitData)
+        //                     .then(function (res) {
+        //                         if (res.code === '0') {
+        //                             that.$message({
+        //                                 message: '修改成功',
+        //                                 type: 'success'
+        //                             });
+        //                             that.getTableData();
+        //                             that.dialog.editorBox.show = false;
+        //                         } else {
+        //                             that.$message.error(res.message);
+        //                         }
+        //                         that.loading = false;
+        //                     }).catch(function () {
+        //                         that.loading = false;
+        //                     });
+        //             } else {
+        //                 that.$message.error('请输入正确的折标系数');
+        //             }
+        //         });
+        //     }
+        // },
         dataSave () {
             let that = this;
             let SubmitData = {

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

@@ -16,7 +16,7 @@
                                     style="width: 100%;"
                                     :type="'daterange'"
                                     :oneFoo="getTableData"
-                                    :defaultOffset="-1"
+                                    :custom ="1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
@@ -47,7 +47,7 @@
                             icon="el-icon-plus"
                             v-privilege="activeMenu + 'ADD'"
                             @click="but_add(1)"
-                        >新增计划</el-button>
+                        >新增子计划</el-button>
                      <div style="float:right; text-align: right;">
                         <el-button
                         type="danger"
@@ -281,7 +281,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.describe'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.describe"
                                 >
                                 <el-date-picker
@@ -329,7 +329,7 @@
                                 <template slot-scope="scope">
                                     <el-form-item
                                     :prop="scope.row.seq + '.grades'"
-                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                     :rules="tableFormRules.grades"
                                   >
                                     <el-select
@@ -362,7 +362,7 @@
                                 <template slot-scope="scope">
                                     <el-form-item
                                   :prop="scope.row.seq + '.specifications'"
-                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                    :rules="tableFormRules.specifications"
                                   >
                                     <el-select
@@ -395,7 +395,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.planWeight'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.planWeight"
                                 >
                                     <el-input
@@ -419,7 +419,7 @@
                                 <template slot-scope="scope">
                                      <el-form-item
                                      :prop="scope.row.seq + '.transportType'"
-                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                      :rules="tableFormRules.transportType"
                                   >
                                     <el-select
@@ -453,7 +453,7 @@
                                     <el-form-item
                                     :prop="scope.row.seq + '.purpose'"
                                     :rules="tableFormRules.purpose"
-                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   >
                                     <el-select
                                     allow-create
@@ -485,7 +485,8 @@
                                 <template slot-scope="scope">
                                    <el-form-item
                                    :prop="scope.row.seq + '.chemicalStandard'"
-                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    :rules="tableFormRules.chemicalStandard"
+                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   >
                                     <el-select
                                     allow-create
@@ -508,6 +509,46 @@
                                 </template>
                                 </el-table-column>
                                 <el-table-column
+                                sortable
+                                    prop="issuedTime"
+                                    label="下发时间"
+                                    align="center"
+                                    min-width="130px"
+                                    :show-overflow-tooltip="true"
+                                ></el-table-column>
+                                <el-table-column
+                                sortable
+                                    prop="createman"
+                                    label="创建人"
+                                    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>
+                                <el-table-column
+                                sortable
+                                    prop="updateman"
+                                    label="修改人"
+                                    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>
+                                <el-table-column
                                 sortable
                                     prop="describe"
                                     label="轮次描述"
@@ -518,7 +559,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.describe'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.describe"
                                 >
                                     <el-input
@@ -542,7 +583,7 @@
                                 <template slot-scope="scope">
                                  <el-form-item
                                  :prop="scope.row.seq + '.memo'"
-                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.memo"
                                 >
                                     <el-input
@@ -555,46 +596,6 @@
                                 <span v-else>{{scope.row.memo}}</span>
                                 </template>
                                 </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="issuedTime"
-                                    label="下发时间"
-                                    align="center"
-                                    min-width="130px"
-                                    :show-overflow-tooltip="true"
-                                ></el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="createman"
-                                    label="创建人"
-                                    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>
-                                <el-table-column
-                                sortable
-                                    prop="updateman"
-                                    label="修改人"
-                                    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>
                                 <el-table-column
                                     prop="roundid"
                                     label="轮次序号"
@@ -1089,7 +1090,7 @@ export default {
                 });
         },
         checkboxT (row, index) {
-            if (row.state === '2' && !this.isCheck) {
+            if (row.state === '3' && !this.isCheck) {
                 return false;
             } else {
                 return true;
@@ -1517,7 +1518,10 @@ export default {
                                 id: that.rightTableObj[key].roundid,
                                 sqno: that.rightTableObj[key].sqno,
                                 createman: that.rightTableObj[key].createman,
-                                createtime: that.rightTableObj[key].createtime
+                                createtime: that.rightTableObj[key].createtime,
+                                issuedTime: that.rightTableObj[key].issuedTime,
+                                updateman: that.rightTableObj[key].updateman,
+                                updatetime: that.rightTableObj[key].updatetime
                             });
                         }
                                 that.loading = true;

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

@@ -16,6 +16,7 @@
                                     style="width: 100%;"
                                     :type="'daterange'"
                                     :oneFoo="getTableData"
+                                    :custom ="1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
@@ -274,7 +275,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.describe'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.describe"
                                 >
                                 <el-date-picker
@@ -314,7 +315,7 @@
                                 <template slot-scope="scope">
                                     <el-form-item
                                     :prop="scope.row.seq + '.grades'"
-                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                     :rules="tableFormRules.grades"
                                   >
                                     <el-select
@@ -347,7 +348,7 @@
                                 <template slot-scope="scope">
                                     <el-form-item
                                   :prop="scope.row.seq + '.specifications'"
-                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                    :rules="tableFormRules.specifications"
                                   >
                                     <el-select
@@ -380,7 +381,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.lengths'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.lengths"
                                 >
                                     <el-input
@@ -404,7 +405,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.planWeight'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                  v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.planWeight"
                                 >
                                     <el-input
@@ -428,7 +429,8 @@
                                 <template slot-scope="scope">
                                     <el-form-item
                                     :prop="scope.row.seq + '.surfaceStandard'"
-                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
+                                     :rules="tableFormRules.surfaceStandard"
                                   >
                                     <el-select
                                     allow-create
@@ -460,7 +462,8 @@
                                 <template slot-scope="scope">
                                    <el-form-item
                                    :prop="scope.row.seq + '.chemicalStandard'"
-                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
+                                   :rules="tableFormRules.chemicalStandard"
                                   >
                                     <el-select
                                     allow-create
@@ -469,7 +472,6 @@
                                     @keydown.native="keyDown" :id="scope.$index + scope.column.id"
                                     v-model="rightTableObj[scope.row.seq].chemicalStandard"
                                     placeholder=""
-
                                     >
                                     <el-option
                                     v-for="item of nameObj.chemicalStandard.arr"
@@ -493,7 +495,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                   :prop="scope.row.seq + '.goinfo'"
-                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.goinfo"
                                 >
                                     <el-select
@@ -515,6 +517,45 @@
                                </template>
                                 </el-table-column>
                                 <el-table-column
+                                sortable
+                                    prop="issuedTime"
+                                    label="下发时间"
+                                    align="center"
+                                    min-width="130px"
+                                    :show-overflow-tooltip="true"
+                                ></el-table-column>
+                                <el-table-column
+                                sortable
+                                    prop="createman"
+                                    label="创建人"
+                                    align="center"
+                                    min-width="76px"
+                                    :show-overflow-tooltip="true"
+                                ></el-table-column>
+                                <el-table-column
+                                sortable
+                                    prop="createtime"
+                                    label="创建时间"
+                                    min-width="130px"
+                                    :show-overflow-tooltip="true"
+                                ></el-table-column>
+                                <el-table-column
+                                sortable
+                                    prop="updateman"
+                                    label="修改人"
+                                    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
                                 sortable
                                     prop="describe"
                                     label="轮次描述"
@@ -525,7 +566,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.describe'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.describe"
                                 >
                                     <el-input
@@ -549,7 +590,7 @@
                                 <template slot-scope="scope">
                                  <el-form-item
                                  :prop="scope.row.seq + '.memo'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.memo"
                                 >
                                     <el-input
@@ -562,45 +603,6 @@
                                 <span v-else>{{scope.row.memo}}</span>
                                 </template>
                                 </el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="issuedTime"
-                                    label="下发时间"
-                                    align="center"
-                                    min-width="130px"
-                                    :show-overflow-tooltip="true"
-                                ></el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="createman"
-                                    label="创建人"
-                                    align="center"
-                                    min-width="76px"
-                                    :show-overflow-tooltip="true"
-                                ></el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="createtime"
-                                    label="创建时间"
-                                    min-width="130px"
-                                    :show-overflow-tooltip="true"
-                                ></el-table-column>
-                                <el-table-column
-                                sortable
-                                    prop="updateman"
-                                    label="修改人"
-                                    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="轮次序号"
@@ -805,10 +807,10 @@ export default {
                 ],
                 purpose: [
                     { required: true, message: '该项不能为空', trigger: 'change' }
+                ],
+                chemicalStandard: [
+                    { required: true, message: '该项不能为空', trigger: 'change' }
                 ]
-                // chemicalStandard: [
-                //     { required: true, message: '该项不能为空', trigger: 'change' }
-                // ]
             },
             nameObj: {
                 timegranid: {
@@ -1080,7 +1082,7 @@ export default {
                 });
         },
         checkboxT (row, index) {
-            if (row.state === '2' && !this.isCheck) {
+            if (row.state === '3' && !this.isCheck) {
                 return false;
             } else {
                 return true;
@@ -1515,7 +1517,10 @@ export default {
                                 createtime: that.rightTableObj[key].createtime,
                                 lengths: that.rightTableObj[key].lengths,
                                 surfaceStandard: that.rightTableObj[key].surfaceStandard,
-                                goinfo: that.rightTableObj[key].goinfo
+                                goinfo: that.rightTableObj[key].goinfo,
+                                issuedTime: that.rightTableObj[key].issuedTime,
+                                updateman: that.rightTableObj[key].updateman,
+                                updatetime: that.rightTableObj[key].updatetime
                             });
                         }
                                 that.loading = true;

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

@@ -16,7 +16,7 @@
                                     style="width: 100%;"
                                     :type="'daterange'"
                                     :oneFoo="getTableData"
-                                    :defaultOffset="-1"
+                                    :custom ="1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
@@ -286,7 +286,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.may'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                  :rules="tableFormRules.may"
                                 >
                                 <el-date-picker
@@ -307,30 +307,6 @@
                                 <span v-else>{{scope.row.may}}</span>
                                 </template>
                                 </el-table-column>
-                                <el-table-column
-                                   sortable
-                                    prop="describe"
-                                    align="center"
-                                    label="轮次描述"
-                                    min-width="160px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                <template slot-scope="scope">
-                                <el-form-item
-                                 :prop="scope.row.seq + '.describe'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                 :rules="tableFormRules.describe"
-                                >
-                                    <el-input
-                                    style="width: 100%;"
-                                    v-model="rightTableObj[scope.row.seq].describe"
-                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
-                                    refcous="true"
-                                    ></el-input>
-                                </el-form-item>
-                                <span v-else>{{scope.row.describe}}</span>
-                                </template>
-                                </el-table-column>
                                 <el-table-column
                                 sortable
                                     prop="state"
@@ -355,7 +331,7 @@
                                 <template slot-scope="scope">
                                     <el-form-item
                                     :prop="scope.row.seq + '.grades'"
-                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                     :rules="tableFormRules.grades"
                                   >
                                     <el-select
@@ -388,7 +364,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.specifications'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                  :rules="tableFormRules.specifications"
                                 >
                                     <el-select
@@ -421,7 +397,7 @@
                                 <template slot-scope="scope">
                                  <el-form-item
                                  :prop="scope.row.seq + '.lengths'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                  :rules="tableFormRules.lengths"
                                 >
                                     <el-input
@@ -445,7 +421,7 @@
                                 <template slot-scope="scope">
                                 <el-form-item
                                  :prop="scope.row.seq + '.planWeight'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                   :rules="tableFormRules.planWeight"
                                 >
                                     <el-input
@@ -532,7 +508,7 @@
                                 <template slot-scope="scope">
                                      <el-form-item
                                      :prop="scope.row.seq + '.transportType'"
-                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                     v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
                                      :rules="tableFormRules.transportType"
                                   >
                                     <el-select
@@ -565,7 +541,8 @@
                                 <template slot-scope="scope">
                                    <el-form-item
                                    :prop="scope.row.seq + '.chemicalStandard'"
-                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                   v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
+                                    :rules="tableFormRules.chemicalStandard"
                                   >
                                     <el-select
                                     allow-create
@@ -588,30 +565,6 @@
                                 </template>
                                 </el-table-column>
                                 <el-table-column
-                                sortable
-                                    prop="memo"
-                                    label="备注"
-                                    align="center"
-                                    min-width="100px"
-                                    :show-overflow-tooltip="true"
-                                >
-                                <template slot-scope="scope">
-                                 <el-form-item
-                                 :prop="scope.row.seq + '.memo'"
-                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
-                                  :rules="tableFormRules.memo"
-                                >
-                                    <el-input
-                                    style="width: 100%;"
-                                    v-model="rightTableObj[scope.row.seq].memo"
-                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
-                                    refcous="true"
-                                    ></el-input>
-                                </el-form-item>
-                                <span v-else>{{scope.row.memo}}</span>
-                                </template>
-                                </el-table-column>
-                                <el-table-column
                                 sortable
                                     prop="issuedTime"
                                     align="center"
@@ -650,6 +603,54 @@
                                     min-width="130px"
                                     :show-overflow-tooltip="true"
                                 ></el-table-column>
+                                <el-table-column
+                                   sortable
+                                    prop="describe"
+                                    align="center"
+                                    label="轮次描述"
+                                    min-width="160px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                <template slot-scope="scope">
+                                <el-form-item
+                                 :prop="scope.row.seq + '.describe'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
+                                 :rules="tableFormRules.describe"
+                                >
+                                    <el-input
+                                    style="width: 100%;"
+                                    v-model="rightTableObj[scope.row.seq].describe"
+                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
+                                    refcous="true"
+                                    ></el-input>
+                                </el-form-item>
+                                <span v-else>{{scope.row.describe}}</span>
+                                </template>
+                                </el-table-column>
+                                <el-table-column
+                                sortable
+                                    prop="memo"
+                                    label="备注"
+                                    align="center"
+                                    min-width="100px"
+                                    :show-overflow-tooltip="true"
+                                >
+                                <template slot-scope="scope">
+                                 <el-form-item
+                                 :prop="scope.row.seq + '.memo'"
+                                 v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '3'"
+                                  :rules="tableFormRules.memo"
+                                >
+                                    <el-input
+                                    style="width: 100%;"
+                                    v-model="rightTableObj[scope.row.seq].memo"
+                                    @keydown.native="keyDown" :id="scope.$index + scope.column.id"
+                                    refcous="true"
+                                    ></el-input>
+                                </el-form-item>
+                                <span v-else>{{scope.row.memo}}</span>
+                                </template>
+                                </el-table-column>
                                 <el-table-column
                                     prop="roundid"
                                     label="轮次序号"
@@ -1125,7 +1126,7 @@ export default {
                 });
         },
         checkboxT (row, index) {
-            if (row.state === '2' && !this.isCheck) {
+            if (row.state === '3' && !this.isCheck) {
                 return false;
             } else {
                 return true;
@@ -1631,7 +1632,10 @@ export default {
                                 lengthTimesWidth: that.rightTableObj[key].lengthTimesWidth,
                                 dimension: that.rightTableObj[key].dimension,
                                 iateralArea: that.rightTableObj[key].iateralArea,
-                                lengths: that.rightTableObj[key].lengths
+                                lengths: that.rightTableObj[key].lengths,
+                                issuedTime: that.rightTableObj[key].issuedTime,
+                                updateman: that.rightTableObj[key].updateman,
+                                updatetime: that.rightTableObj[key].updatetime
                             });
                         }
                                 that.loading = true;

src/views/energyQuality/components/power/powerMonitoringDayData.vue

@@ -16,6 +16,8 @@
                                     filterable clearable
                                     v-model="filterForm.data.itemname"
                                     placeholder=""
+                                    multiple
+                                    collapse-tags
                                     style="width: 100%;"
                                 >
                                     <el-option
@@ -33,6 +35,8 @@
                                     filterable clearable
                                     v-model="filterForm.data.powersystemname"
                                     placeholder=""
+                                    multiple
+                                    collapse-tags
                                     style="width: 100%;"
                                 >
                                     <el-option
@@ -50,6 +54,8 @@
                                     filterable clearable
                                     v-model="filterForm.data.powermonitorname"
                                     placeholder=""
+                                    multiple
+                                    collapse-tags
                                     style="width: 100%;"
                                 >
                                     <el-option
@@ -104,14 +110,14 @@
                             v-privilege="activeMenu + 'QUERY'"
                             @click="getTableData(1)"
                         >查询</el-button>
-                        <el-button
+                        <!-- <el-button
                             class="button"
                             type="primary"
                             size="mini"
                             icon="el-icon-refresh"
                             v-privilege="activeMenu + 'QUERY'"
                             @click="tableDataCancel();"
-                        >重置</el-button>
+                        >重置</el-button> -->
                         <el-button
                             size="mini"
                             :icon="filterForm.show ? 'el-icon-caret-top' : 'el-icon-caret-bottom'"
@@ -601,13 +607,13 @@ export default {
         getTableData (pageNum) {
             let that = this,
                 params = {
-                    powermonitorname: that.filterForm.data.powermonitorname,
+                    powermonitorname: that.filterForm.data.powermonitorname.join(','),
                     monitoringvalue: that.filterForm.data.monitoringvalue,
                     batchno: that.filterForm.data.batchno,
-                    sitem: that.filterForm.data.itemname,
+                    sitem: that.filterForm.data.itemname.join(','),
                     startTime: that.filterForm.data.monitordate[0],
                     endTime: that.filterForm.data.monitordate[1],
-                    powersystemname: that.filterForm.data.powersystemname
+                    powersystemname: that.filterForm.data.powersystemname.join(','),
                 };
             that.pageNum = pageNum || that.pageNum;
             that.tableLoading = true;

src/views/energyScheduling/components/measuringLocationData/measuringLocationEntry.vue

@@ -160,6 +160,25 @@
                         </el-col>
                     </el-row>
                     <el-row>
+                        <el-col :span="6">
+                             <el-form-item label="工序">
+                                <el-select
+                                    filterable clearable
+                                    v-model="filterForm.data.costid"
+                                    placeholder="工序"
+                                    multiple
+                                    collapse-tags
+                                    style="width: 100%;"
+                                >
+                                    <el-option
+                                      v-for="item of nameObj.workprocid.arr"
+                                      :key="item.id"
+                                      :value="item.id"
+                                      :label="item.name"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="6">
                             <el-form-item label="站所">
                                 <el-select
@@ -371,6 +390,17 @@
                             width="70px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
+                        <el-table-column
+                        sortable
+                        prop="costid"
+                        label="工序"
+                        min-width="100px"
+                        :show-overflow-tooltip="true"
+                    >
+                        <template slot-scope="scope">
+                            <span>{{ nameObj.workprocid.obj[scope.row.costid] ? nameObj.workprocid.obj[scope.row.costid] : scope.row.costid }}</span>
+                        </template>
+                    </el-table-column>
                         <el-table-column
                             sortable prop="lname"
                             label="位置"
@@ -792,6 +822,10 @@ export default {
             singleTableHeight: 200,
             tableData: [],
             nameObj: {
+                 workprocid: {
+                    obj: {},
+                    arr: []
+                },
                 timegranid: {
                     obj: {},
                     arr: []
@@ -963,6 +997,7 @@ export default {
         that.getEnergyIdData();
         that.getLocateIdData();
         that.getNetworkIdData();
+        that.getworkprocidData();
         that.getHierarchyData();
         that.getUnitIdData();
         that.getPropertyIdData();
@@ -1187,7 +1222,8 @@ export default {
                     networkid: that.filterForm.data.networkid.toString(),
                     hierarchy: that.filterForm.data.hierarchy,
                     tagAlias: that.filterForm.data.tagAlias,
-                    propertyid: that.filterForm.data.propertyid.toString()
+                    propertyid: that.filterForm.data.propertyid.toString(),
+                    costid: that.filterForm.data.costid.join(',')
                 };
             that.pageNum = pageNum || that.pageNum;
             that.tableLoading = true;
@@ -1220,6 +1256,7 @@ export default {
                                 lname: item.LNAME,
                                 updateman: item.UPMAN,
                                 updatetime: item.UPTIME,
+                                costid: item.COSTID,
                                 // 暂时没显示
                                 itemtype: item.ITEMTYPE,
                                 timegranid: item.TIMEGRANID,
@@ -1502,6 +1539,29 @@ export default {
                 }).catch(function () {
                 });
         },
+        // 获取工序
+        getworkprocidData () {
+            let that = this
+            let url = 'pass/ems/v1/trmworkprocs/getIdAndName';
+            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.name
+                            })
+                            obj[item.id] = item.name;
+                        }
+                        that.nameObj.workprocid.arr = arr;
+                        that.nameObj.workprocid.obj = obj;
+                    } else {
+                        that.$message.error(res.message);
+                    }
+                });
+        },
         chartSeriesType () {
             let that = this;
             for (let item of that.dialog.trendChart.chart.option.series) {