提交代码

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -21,7 +21,7 @@
           v-for="item in item_columns"
           :key="item.id"
           :label="item.item_name"
-          :value="item.id"
+          :value="item.item_id"
         ></el-option>
       </el-select>
 
@@ -308,14 +308,14 @@
           }
         }
         this.item_columns = item_inspection_reference
-        
-        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
+
+        var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].item_id)
         console.log("projectInfo",projectInfo)
         this.query.project_id = projectInfo.project_id
-        this.query.item_id = projectInfo.id
+        this.query.item_id = projectInfo.item_id
         this.item_name = projectInfo.item_name
         this.query.range_type = projectInfo.range_type
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeItem(val) {
         this.query.page = 1
@@ -324,7 +324,7 @@
         console.log(projectInfo)
         this.item_name = projectInfo.item_name
 
-        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+        this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
 
       }, changeRangeValue(val) {
         this.query.range_value = val
@@ -362,11 +362,11 @@
               this.item_columns = item
               this.item_name = item[0].item_name
 
-              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].id)
+              var projectInfo = this.getPojectInfo(this.project_columns[0].project_id, this.item_columns[0].item_id)
               this.query.project_id = projectInfo.project_id
-              this.query.item_id = projectInfo.id
+              this.query.item_id = projectInfo.item_id
               this.query.range_type = projectInfo.range_type
-              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.id)
+              this.GetRangeValue(projectInfo.range_type, projectInfo.project_id, projectInfo.item_id)
             } else {
               this.$message.error(resp.msg)
 
@@ -379,7 +379,7 @@
       },
       getPojectInfo(project_id, item_id) {
         for (let i = 0; i < this.all_inspection_reference.length; i++) {
-          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].id == item_id) {
+          if (this.all_inspection_reference[i].project_id == project_id && this.all_inspection_reference[i].item_id == item_id) {
             return this.all_inspection_reference[i]
           }
         }

src/xt_pages/workforce/template.vue

@@ -187,22 +187,11 @@
 
         <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
 
-          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
-
-             <span v-if="schedule.mode ==1">(本周)</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
-
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(下下周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(本周)</span>
-
-
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+          <span slot="label"> {{first_template.week?'一周模版'+'（'+first_template.week+'周'+'）':'一周模版'+'（'+first_template.week+'周'+'）'}}
 
+             <span v-if="schedule.mode ==1">{{'(本周)'}}</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(下一周)'}}</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(本周)'}}</span>
 
           </span>
 
@@ -210,29 +199,19 @@
 
         <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
 
-          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
-
-              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
-             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
-
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==0">(本周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==1">(下周)</span>
-             <span v-if="schedule.mode == 3 && schedule.execute_times%3 ==2">(下下周)</span>
+          <span slot="label"> {{second_template.week?'二周模版'+'（'+second_template.week+'周'+'）':'二周模版'+'（'+second_template.week+'周'+'）'}}
 
-
-              <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==0">(下下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==1">(下周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==2">(本周)</span>
-             <span v-if="schedule.mode == 4 && schedule.execute_times%4 ==3">(上周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">{{'(本周)'}}</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">{{'(下一周)'}}</span>
 
           </span>
         </el-tab-pane>
-
-        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+<!--                  {{ four_template.week?four_template.week+'周':""}}-->
+        <el-tab-pane :label="'三周模版'+'（'+third_template.week+'周'+'）'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
 
         </el-tab-pane>
 
-      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+      <el-tab-pane :label="'四周模版'+'（'+four_template.week+'周'+'）'" name="four" :disabled="template_mode.mode  != 4 ">
         </el-tab-pane>
       </el-tabs>
               </div>