lrl - 2021-10-12

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

@@ -34,6 +34,7 @@
                             <el-form-item label="工序">
                             <el-select
                             filterable clearable
+                            collapse-tags
                             v-model="filterForm.data.workprocType"
                             multiple
                             placeholder=""
@@ -52,6 +53,7 @@
                             <el-form-item label="状态">
                             <el-select
                             filterable
+                            collapse-tags
                             v-model="filterForm.data.state"
                             multiple
                             placeholder=""
@@ -78,14 +80,14 @@
                                      icon="el-icon-add-outline"
                                     @click="passaudits()"
                                     :loading="loading"
-                                >通过审核</el-button>
+                                >审核下发</el-button>
                                  <el-button
                                      size="mini"
                                      type="danger"
                                      icon="el-icon-add-outline"
                                     @click="turndown()"
                                     :loading="loading"
-                                >驳回</el-button>
+                                >取消下发</el-button>
                             </el-col>
                             <el-col :span="8">
                                 <div style="float:right; text-align: right;">

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

@@ -26,6 +26,7 @@
                          <el-form-item label="钢种">
                             <el-select
                             filterable clearable
+                            collapse-tags
                             v-model="filterForm.data.grades"
                             multiple
                             placeholder=""
@@ -45,6 +46,7 @@
                           <el-form-item label="规格">
                             <el-select
                             filterable clearable
+                            collapse-tags
                             v-model="filterForm.data.specifications"
                             multiple
                             placeholder=""
@@ -268,7 +270,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"
                                     :rules="tableFormRules.grades"
                                   >
                                     <el-select
@@ -301,7 +303,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"
                                    :rules="tableFormRules.specifications"
                                   >
                                     <el-select
@@ -418,7 +420,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"
                                     :rules="tableFormRules.transportType"
                                   >
                                     <el-select
@@ -451,7 +453,7 @@
                         <template slot-scope="scope">
                         <el-form-item
                                     :prop="scope.row.seq + '.purpose'"
-                                    v-if=" !isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    v-if=" !isCheck && scope.row.isSelection"
                                     :rules="tableFormRules.purpose"
                                   >
                                     <el-select
@@ -543,7 +545,7 @@
                         >
                             <template slot-scope="scope">
                                 <el-form-item
-                                    v-if="!isCheck && scope.row.isSelection && scope.row.state !== '2'"
+                                    v-if="!isCheck && scope.row.isSelection"
                                     :prop="scope.row.seq + '.memo'"
                                     :rules="tableFormRules.memo"
                                 >
@@ -2014,7 +2016,11 @@ export default {
                             SubmitData.push({
                                 id: that.tableFormDataObj[key].id,
                                 workprocType: that.filterForm.data.workproc_type,
-                                state: '1'
+                                state: '1',
+                                lengths: that.tableFormDataObj[key].lengths,
+                                grades: that.tableFormDataObj[key].grades,
+                                specifications: that.tableFormDataObj[key].specifications,
+                                planWeight: that.tableFormDataObj[key].planweight
                             });
                         }
                         that.loading = true;

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

@@ -16,6 +16,7 @@
                                     v-model="filterForm.data.may"
                                     style="width: 100%;"
                                     :type="'daterange'"
+                                    :custom ="1"
                                 ></zj-timegran-date>
                             </el-form-item>
                         </el-col>
@@ -32,6 +33,7 @@
                             <el-form-item label="工序">
                             <el-select
                             filterable clearable
+                            collapse-tags
                             v-model="filterForm.data.workprocType"
                             multiple
                             placeholder=""
@@ -65,13 +67,13 @@
                                     size="mini"
                                     v-privilege="activeMenu + 'approve'"
                                     @click="approval()"
-                                    >批准</el-button>
+                                    >审核</el-button>
                                     <el-button
                                     type="danger"
                                     size="mini"
                                     v-privilege="activeMenu + 'NOAGREE'"
                                     @click="nopass()"
-                                    >不通过</el-button>
+                                    >取消审核</el-button>
                                     <el-button
                                     type="primary"
                                     size="mini"
@@ -83,7 +85,7 @@
                                     size="mini"
                                     v-privilege="activeMenu + 'reject'"
                                     @click="rejected()"
-                                    >驳回</el-button>
+                                    >取消同意</el-button>
                             </el-col>
                             <el-col :span="8" style="float:right; text-align: right;">
                                 <div>
@@ -332,7 +334,7 @@
                         >
                         <template slot-scope="scope">
                                 <el-form-item
-                                    v-if="scope.row.state === '0' && scope.row.isSelection"
+                                    v-if="(scope.row.state === '0' || scope.row.state === '1') && scope.row.isSelection"
                                     :prop="scope.row.seq + '.planweight'"
                                     :rules="tableFormRules.planWeight"
                                 >