lrl -2021-10-11

src/components/zg/timegranDate.vue

@@ -93,7 +93,7 @@ export default {
             default: function () {
                 return 0;
             }
-        }
+        },
     },
     data () {
         return {
@@ -338,7 +338,8 @@ export default {
                     endDate = new Date(new Date().getFullYear(), new Date().getMonth() + 1, '01');
                     endDate = new Date(endDate - 1);
                     that.date = [formatDate(setDate, timeformat), formatDate(endDate, timeformat)];
-                } else {
+                }
+                 else {
                     that.date = [formatDate(setDate, timeformat), formatDate(setDate, timeformat)];
                 }
             }

src/views/energyOperationSupport/components/startStopDocuments/SSDApproval.vue

@@ -842,7 +842,7 @@ export default {
                         url = 'pass/ems/v1/tcm035s/submit/';
                         message = '提交成功';
                     }
-                    that.axios.put(url, SubmitData)
+                    that.axios.put(url, SubmitData, {headers: {'Content-Type': 'multipart/form-data'}})
                         .then(function (res) {
                             if (res.code === '0') {
                                 that.$message({

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

@@ -13,24 +13,24 @@
                         <el-col :span="6">
                             <el-form-item label="排产日期">
                                 <zj-timegran-date
-                                    v-model="filterForm.data.may"
+                                    v-model="filterForm.data.time"
                                     style="width: 100%;"
                                     :type="'daterange'"
-                                    :timegranId="filterForm.data.timegranid"
                                     :oneFoo="getTableData"
+                                    :custom ="1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :span="4">
                            <el-form-item label="编号">
-                                <el-input
+                                    <el-input
                                     v-model="filterForm.data.id"
                                     style="width: 100%;"
                                     refcous="true"
                                     ></el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="6">
+                        <el-col :span="4">
                             <el-form-item label="工序">
                             <el-select
                             filterable clearable
@@ -48,6 +48,24 @@
                             </el-select>
                             </el-form-item>
                         </el-col>
+                        <el-col :span="4">
+                            <el-form-item label="状态">
+                            <el-select
+                            filterable
+                            v-model="filterForm.data.state"
+                            multiple
+                            placeholder=""
+                            style="width: 100%;"
+                            >
+                            <el-option
+                            v-for="item of nameObj.state.arr"
+                            :key="item.id"
+                            :value="item.id"
+                            :label="item.name"
+                            ></el-option>
+                            </el-select>
+                            </el-form-item>
+                        </el-col>
                     </el-row>
                 </el-form>
                 <div class="box-top-gjl">
@@ -102,7 +120,8 @@
                     label-width="0px"
                     :model="tableFormDataObj"
                 >
-                    <el-table stripe
+                    <el-table
+                        stripe
                         id="singleTable"
                         ref="singleTable"
                         :data="tableData"
@@ -113,9 +132,7 @@
                         size="mini"
                         highlight-current-row
                         @selection-change="handleSelectionChange"
-                        show-summary
                         :summary-method="getSummaries"
-                        :span-method="arraySpanMethod"
                         :row-class-name="tableRowClassName"
                         @cell-click="cellClick"
                         @expand-change="rowClick"
@@ -248,6 +265,24 @@
                             :show-overflow-tooltip="true"
                         >
                         </el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="gmReviewer"
+                            label="审核人"
+                            align="center"
+                            min-width="120px"
+                            :show-overflow-tooltip="true"
+                        >
+                        </el-table-column>
+                         <el-table-column
+                             sortable
+                            prop="gmReviewerTime"
+                            label="审核时间"
+                            align="center"
+                            width="120px"
+                            :show-overflow-tooltip="true"
+                        >
+                        </el-table-column>
                         <el-table-column
                             sortable
                             prop="createMan"
@@ -309,7 +344,9 @@ export default {
                 data: {
                     show: false,
                     id: '',
-                    workprocType: []
+                    workprocType: [],
+                    state: ['1'],
+                    time: [(new Date() - 3600 * 1000 * 24 * 7), (new Date() + 3600 * 1000 * 24 * 7)]
                 },
                 rules: {
                 },
@@ -350,19 +387,23 @@ export default {
                     },
                     arr: [
                         {
-                            name: '1',
+                            id: '1',
+                            name: '等待审核',
                             color: '#7a7a7a'
                         },
                         {
-                            name: '2',
+                            id: '2',
+                            name: '已下发',
                             color: 'green'
                         },
                         {
-                             name: '3',
+                            id: '3',
+                            name: '已接收',
                             color: 'red'
                         },
                         {
-                            name: '4',
+                            id: '4',
+                            name: '审核失败',
                             color: 'red'
                         }
                     ]
@@ -833,10 +874,11 @@ export default {
             let that = this,
             params = {},
                 pData = {
-                   startTime: that.filterForm.data.may[0],
-                   endTime: that.filterForm.data.may[1],
+                   startTime: that.filterForm.data.time[0],
+                   endTime: that.filterForm.data.time[1],
                    id: that.filterForm.data.id,
-                   workprocType: that.filterForm.data.workprocType.toString()
+                   workprocType: that.filterForm.data.workprocType.toString(),
+                   state: that.filterForm.data.state.toString() === '' ? '1,2,3,4' : that.filterForm.data.state.toString()
                 };
                 for (let key in pData) {
                     if (pData[key]) {
@@ -870,7 +912,9 @@ export default {
                                 workprocType: item.workprocType,
                                 createMan: item.createMan,
                                 createTime: item.createTime,
-                                planWeight: item.planWeight
+                                planWeight: item.planWeight,
+                                gmReviewer: item.gmReviewer,
+                                gmReviewerTime: item.gmReviewerTime
                             });
                         }
                         that.total = res.data.total;

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

@@ -18,6 +18,7 @@
                                     :type="'daterange'"
                                     :timegranId="filterForm.data.timegranid"
                                     :oneFoo="getTableData"
+                                    :custom ="1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
@@ -479,7 +480,6 @@
                             width="135px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-
                         <el-table-column
                         sortable
                             prop="createman"
@@ -515,6 +515,24 @@
                             width="77px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
+                        <el-table-column
+                            sortable
+                            prop="gmReviewer"
+                            label="审核人"
+                            align="center"
+                            min-width="120px"
+                            :show-overflow-tooltip="true"
+                        >
+                        </el-table-column>
+                         <el-table-column
+                             sortable
+                            prop="gmReviewerTime"
+                            label="审核时间"
+                            align="center"
+                            width="120px"
+                            :show-overflow-tooltip="true"
+                        >
+                        </el-table-column>
                         <el-table-column
                         sortable
                             prop="memo"
@@ -1554,7 +1572,9 @@ export default {
                                 memo: item.memo,
                                 planweight: item.planWeight,
                                 dimension: item.dimension,
-                                deliveryDate: item.deliveryDate
+                                deliveryDate: item.deliveryDate,
+                                gmReviewer: item.gmReviewer,
+                                gmReviewerTime: item.gmReviewerTime
                             });
                         }
                         that.total = res.data.total;
@@ -1871,7 +1891,9 @@ export default {
                                 deliveryDate: that.tableFormDataObj[key].deliveryDate,
                                 dimension: that.tableFormDataObj[key].dimension,
                                 iateralArea: that.tableFormDataObj[key].iateralarea,
-                                lengthTimesWidth: that.tableFormDataObj[key].lengthtimeswidth
+                                lengthTimesWidth: that.tableFormDataObj[key].lengthtimeswidth,
+                                gmReviewer: that.tableFormDataObj[key].gmReviewer,
+                                gmReviewerTime: that.tableFormDataObj[key].gmReviewerTime
                             });
                         }
                         that.loading = true;
@@ -1911,16 +1933,10 @@ export default {
                                 transportType: that.tableFormDataObj[key].transportType,
                                 specifications: that.tableFormDataObj[key].specifications,
                                 unitid: that.tableFormDataObj[key].unitid,
-                                memo: that.tableFormDataObj[key].memo,
                                 workprocType: that.filterForm.data.workproc_type,
                                 chemicalStandard: that.tableFormDataObj[key].chemicalStandard,
-                                planWeight: that.tableFormDataObj[key].planweight,
-                                createTime: that.tableFormDataObj[key].createTime,
-                                createMan: that.tableFormDataObj[key].createman,
-                                updateTime: that.tableFormDataObj[key].updateTime,
+                                planWeight: '0',
                                 deliveryDate: that.tableFormDataObj[key].deliveryDate,
-                                updateMan: that.tableFormDataObj[key].updateman,
-                                state: that.tableFormDataObj[key].state,
                                 lengths: that.tableFormDataObj[key].lengths,
                                 surfaceStandard: that.tableFormDataObj[key].surfacestandard,
                                 dimension: that.tableFormDataObj[key].dimension,

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

@@ -774,7 +774,7 @@ export default {
         if (that.butPrivilege.CHECK || that.butPrivilege.UNDOCHECK) {
             that.isCheck = true;
         }
-         that.getRoles();
+        that.getRoles();
         that.getUnitIdData();
         that.getLocateIdData();
         that.getlengthTimesWidth();