完善

src/views/check/checkjob/CheckJob.vue

@@ -249,6 +249,12 @@ export default {
           checked: true,
           width: '100px'
         },
+        {
+          title: '标准编码',
+          dataIndex: 'standardNo',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '设备新号',
           dataIndex: 'sbNo',

src/views/check/checkjob/modules/CheckJobSelectModal.vue

@@ -107,8 +107,10 @@ export default {
           }
         },
         {
-          title: '计划id',
-          dataIndex: 'planId'
+          title: '标准编码',
+          dataIndex: 'standardNo',
+          checked: true,
+          width: '150px'
         },
         {
           title: '执行日期',

src/views/check/checkjob/modules/CheckJobTable.vue

@@ -163,6 +163,12 @@ export default {
           },
           checked: true
         },
+        {
+          title: '标准编码',
+          dataIndex: 'standardNo',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '任务要求',
           dataIndex: 'requirement',

src/views/check/checkjob/modules/CheckJobTableWaitDo.vue

@@ -172,21 +172,17 @@ export default {
           },
           checked: true
         },
- /*       {
-          title: '计划单号',
-          dataIndex: 'planNo',
-          checked: true
-        },*/
+        {
+          title: '标准编码',
+          dataIndex: 'standardNo',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '任务名称',
           dataIndex: 'name',
           checked: true
         },
-    /*    {
-          title: '计划名称',
-          dataIndex: 'planName',
-          checked: true
-        },*/
         {
           title: '负责人',
           dataIndex: 'checkUserName',

src/views/check/checkjob/modules/Detail.vue

@@ -20,7 +20,7 @@
     <title-divider title="标准信息" width="90px"></title-divider>
     <detail-list title="" :col="2">
       <detail-list-item term="标准名称">{{ modelStandard.name }}</detail-list-item>
-      <detail-list-item term="编码">{{ modelStandard.no }}</detail-list-item>
+      <detail-list-item term="标准编码">{{ modelStandard.no }}</detail-list-item>
       <detail-list-item term="检查类型">{{ BaseTool.Object.getField(typeMap,modelStandard.type) }}</detail-list-item>
       <detail-list-item term="计划周期">{{ modelStandard.period }}{{ BaseTool.Object.getField(periodTypeMap,modelStandard.periodType) }}</detail-list-item>
       <detail-list-item term="维护等级">{{ BaseTool.Object.getField(periodTypeMap,modelStandard.level) }}</detail-list-item>

src/views/check/checkjob/modules/DetailSbCheckJob.vue

@@ -145,6 +145,12 @@ export default {
             return index + 1
           }
         },
+        {
+          title: '标准编码',
+          dataIndex: 'standardNo',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '任务要求',
           dataIndex: 'requirement',

src/views/check/checkjob/modules/DetailStandardCheckJob.vue

@@ -133,6 +133,12 @@ export default {
             return index + 1
           }
         },
+        {
+          title: '标准编码',
+          dataIndex: 'standardNo',
+          checked: true,
+          width: '150px'
+        },
         {
           title: '任务要求',
           dataIndex: 'requirement',

src/views/repair/repair-reason/RepairReason.vue

@@ -119,7 +119,7 @@ export default {
           ellipsis: true,
           width: '200px'
         },
-        {
+     /*   {
           title: '改进措施类别',
           dataIndex: 'type',
           ellipsis: true,
@@ -127,7 +127,7 @@ export default {
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.typeMap, text)
           }
-        },
+        },*/
         {
           title: '改进内容',
           dataIndex: 'changeRepairPlanContent',

src/views/repair/repair-reason/modules/BaseForm.vue

@@ -99,30 +99,37 @@
           </a-col>
         </a-row>
         <title-divider title="改进措施" width="90px"></title-divider>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="更新维护标准"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol">
+              <a-checkbox :checked="changeRepairPlan" v-model="changeRepairPlan"></a-checkbox>
+            </a-form-item>
+          </a-col>
+        </a-row>
         <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item
-              label="改进类别"
+              label="更新"
+              v-show="changeRepairPlan"
               :labelCol="BaseTool.Constant.labelCol2"
               :wrapperCol="BaseTool.Constant.wrapperCol2"
             >
-              <a-select @change="changeType" style="width: 70%" v-decorator="['type', {rules: [{required: true, message: '改进类别不能为空'}]}]" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in typeMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
-                </a-select-option>
-              </a-select>
-              <a-button v-show="type==1" style="margin-left: 10px" @ok="handleOk" @click="handleViewCheck()" type="default" >维护项目完善</a-button>
-              <a-button v-show="type==2" style="margin-left: 10px" type="default" @ok="handleOk" @click="handleViewBom()">备件bom完善</a-button>
+              <a-button
+                v-show="changeRepairPlan"
+                @ok="handleOk"
+                @click="handleViewCheck()"
+                type="default" >维护标准</a-button>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item
-              label="改进内容"
+              label="内容"
+              v-show="changeRepairPlan"
               :labelCol="BaseTool.Constant.labelCol2"
               :wrapperCol="BaseTool.Constant.wrapperCol2"
             >
@@ -132,6 +139,118 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="更新备件计划"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol">
+              <a-checkbox :checked="changeSparePlan" v-model="changeSparePlan"></a-checkbox>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="24" :md="24" :sm="24">
+            <a-form-item
+              label="更新"
+              v-show="changeRepairPlan"
+              :labelCol="BaseTool.Constant.labelCol2"
+              :wrapperCol="BaseTool.Constant.wrapperCol2"
+            >
+              <a-button
+                v-show="changeSparePlan"
+                @ok="handleOk"
+                @click="handleViewBom()"
+                type="default" >备件bom</a-button>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="24" :md="24" :sm="24">
+            <a-form-item
+              label="内容"
+              v-show="changeSparePlan"
+              :labelCol="BaseTool.Constant.labelCol2"
+              :wrapperCol="BaseTool.Constant.wrapperCol2"
+            >
+              <a-textarea
+                :auto-size="{ minRows: 5 }"
+                v-decorator="['changeSparePlanContent']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="人员培训"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol">
+              <a-checkbox :checked="userTeach" v-model="userTeach"></a-checkbox>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="24" :md="24" :sm="24">
+            <a-form-item
+              label="内容"
+              v-show="userTeach"
+              :labelCol="BaseTool.Constant.labelCol2"
+              :wrapperCol="BaseTool.Constant.wrapperCol2"
+            >
+              <a-textarea
+                :auto-size="{ minRows: 5 }"
+                v-decorator="['userTeachContent']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="设备改造升级"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol">
+              <a-checkbox :checked="sbChange" v-model="sbChange"></a-checkbox>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="24" :md="24" :sm="24">
+            <a-form-item
+              label="内容"
+              v-show="sbChange"
+              :labelCol="BaseTool.Constant.labelCol2"
+              :wrapperCol="BaseTool.Constant.wrapperCol2"
+            >
+              <a-textarea
+                :auto-size="{ minRows: 5 }"
+                v-decorator="['sbChangeContent']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="12" :md="24" :sm="24">
+            <a-form-item
+              label="其他"
+              :labelCol="BaseTool.Constant.labelCol"
+              :wrapperCol="BaseTool.Constant.wrapperCol">
+              <a-checkbox :checked="otherChange" v-model="otherChange"></a-checkbox>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+          <a-col :lg="24" :md="24" :sm="24">
+            <a-form-item
+              label="内容"
+              v-show="otherChange"
+              :labelCol="BaseTool.Constant.labelCol2"
+              :wrapperCol="BaseTool.Constant.wrapperCol2"
+            >
+              <a-textarea
+                :auto-size="{ minRows: 5 }"
+                v-decorator="['otherChangeContent']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
     </div>
     <detail-sb-check ref="detailSbCheckModal" @ok="handleOk"/>

src/views/repair/repair-reason/modules/Detail.vue

@@ -31,48 +31,37 @@
         <div class="content">{{ model.reasonAnalysis }}</div>
       </a-col>
     </a-row>
-    <title-divider title="改进措施类别" width="120px"></title-divider>
+    <title-divider title="改进措施" width="120px"></title-divider>
     <a-row>
       <a-col style="margin-top: 10px">
-        <div class="content">{{ BaseTool.Object.getField(typeMap,model.type) }}</div>
+        <div class="term">更新备件计划:</div>
+        <div class="content">{{ model.changeSparePlanContent }}</div>
       </a-col>
     </a-row>
-    <title-divider title="改进措施内容" width="120px"></title-divider>
     <a-row>
       <a-col style="margin-top: 10px">
-        <div class="content">{{ model.changeRepairPlanContent }}</div>
+        <div class="term">更新备件计划:</div>
+        <div class="content">{{ model.changeSparePlanContent }}</div>
       </a-col>
     </a-row>
-<!--    <a-row>
+    <a-row>
       <a-col style="margin-top: 10px">
-        <div class="term">更新备件计划:</div>
-        <div class="content">{{ model.changeSparePlanContent }}</div>
+        <div class="term">人员培训:</div>
+        <div class="content">{{ model.userTeachContent }}</div>
+      </a-col>
+    </a-row>
+    <a-row>
+      <a-col style="margin-top: 10px">
+        <div class="term">设备改造升级:</div>
+        <div class="content">{{ model.sbChangeContent }}</div>
+      </a-col>
+    </a-row>
+    <a-row>
+      <a-col style="margin-top: 10px">
+        <div class="term">其他:</div>
+        <div class="content">{{ model.otherChangeContent }}</div>
       </a-col>
-    </a-row>-->
-    <!--      <a-row>
-        <a-col style="margin-top: 10px">
-          <div class="term">更新备件计划:</div>
-          <div class="content">{{ model.changeSparePlanContent }}</div>
-        </a-col>
-      </a-row>
-      <a-row>
-        <a-col style="margin-top: 10px">
-          <div class="term">人员培训:</div>
-          <div class="content">{{ model.userTeachContent }}</div>
-        </a-col>
-      </a-row>
-      <a-row>
-        <a-col style="margin-top: 10px">
-          <div class="term">设备改造升级:</div>
-          <div class="content">{{ model.sbChangeContent }}</div>
-        </a-col>
-      </a-row>
-      <a-row>
-        <a-col style="margin-top: 10px">
-          <div class="term">其他:</div>
-          <div class="content">{{ model.otherChangeContent }}</div>
-        </a-col>
-      </a-row>-->
+    </a-row>
     <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
     </template>