完善

src/api/repair/application-form.js

@@ -78,7 +78,21 @@ export function fetchRepairApplicationForm (parameter) {
     }
   })
 }
-
+/**
+ * fetch single func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function getSbPositions (parameter) {
+  return axios({
+    url: '/sb/positions/longYan?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}
 /**
  * query list func
  * parameter: { }

src/utils/dict.js

@@ -144,6 +144,8 @@ DictCache.TYPE = {
   REPAIR_REASON_TYPE: 'REPAIR_REASON_TYPE', // 分析措施类别
   REPAIR_QUESTION: 'REPAIR_QUESTION', // 故障描述
   YES_NO: 'YES_NO', // 是否
+  TRUST_DEPT_TYPE: 'TRUST_DEPT_TYPE', // 委托单位
+  LEVEL_TYPE: 'LEVEL_TYPE', // 工作优选权
   REPAIR_FORM_STATUS: 'REPAIR_FORM_STATUS', // 维修状态
   REPAIR_CHECK_STATUS: 'REPAIR_CHECK_STATUS', // 验收状态
   REPAIR_FEE_TYPE: 'REPAIR_FEE_TYPE', // 费用类别

src/views/repair/application-form/modules/BaseForm.vue

@@ -51,6 +51,22 @@
             <a-button style="width: 30%" type="primary" @click="handlePartSelect">选择</a-button>
           </a-form-item>
         </row-item>-->
+        <row-item>
+          <a-form-item
+            label="委托单位"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['trustDept', {rules: [{required: true, message: '委托单位不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in trustMap"
+                :key="value"
+                :label="label"
+                :value="value">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="维修部门"
@@ -69,18 +85,37 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="维修部门单位"
+            label="维修专业"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['repairProfessor', {rules: [{required: true, message: '检修专业不能为空'}]}]" placeholder="请选择">
-              <a-select-option
+            <a-tree-select
+              tree-checkable
+              :show-checked-strategy="SHOW_PARENT"
+              v-decorator="['repairProfessor', {rules: [{required: true, message: '检修专业不能为空'}]}]"
+              placeholder="请选择">
+              <a-tree-select-node
                 v-for="(label,value) in professorMap"
                 :key="value"
-                :label="label"
+                :title="label"
                 :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
+              </a-tree-select-node>
+            </a-tree-select>
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="生产装置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-cascader
+              :options="sbPositionList"
+              :load-data="loadData"
+              placeholder="请选择"
+              change-on-select
+              v-decorator="['sbPosition', {rules: [{required: true, message: '生产装置不能为空'}]}]"
+            />
           </a-form-item>
         </row-item>
         <row-item>
@@ -120,7 +155,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select @change="changePlanFlag" v-decorator="['category', {rules: [{required: true, message: '计划性维修不能为空'}]}]" placeholder="请选择">
+            <a-select @change="changePlanFlag" v-decorator="['category', {rules: [{required: true, message: '工单类别不能为空'}]}]" placeholder="请选择">
               <a-select-option
                 v-for="(label,value) in categoryMap"
                 :key="value"
@@ -146,7 +181,23 @@
             </a-select>
           </a-form-item>
         </row-item>
-        <row-item v-show="category === 1">
+        <row-item v-if="category === 1">
+          <a-form-item
+            label="计划性维修级别"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['repairPlanLevel', {rules: [{required: true, message: '计划性维修级别不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="value in ['大','中','小']"
+                :key="value"
+                :label="value"
+                :value="value">{{ value }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
+        <!-- <row-item v-show="category === 1">
           <a-form-item
             label="要求日期"
             :labelCol="BaseTool.Constant.labelCol"
@@ -157,8 +208,8 @@
               :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
               v-decorator="['limitDate']" />
           </a-form-item>
-        </row-item>
-        <row-item v-show="category === 2">
+        </row-item> -->
+        <!-- <row-item v-show="category === 2">
           <a-form-item
             label="要求时间"
             :labelCol="BaseTool.Constant.labelCol"
@@ -169,6 +220,48 @@
               suffix="小时"
               v-decorator="['limitHours', {rules: [{required: true, message: '要求时间不能为空'}]}]" />
           </a-form-item>
+        </row-item> -->
+        <row-item>
+          <a-form-item
+            label="计划开始时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              style="width: 100%"
+              show-time
+              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+              v-decorator="['planStartTime', {rules: [{required: true, message: '计划开始时间不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="计划结束时间"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-date-picker
+              style="width: 100%"
+              show-time
+              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
+              v-decorator="['planEndTime', {rules: [{required: true, message: '计划结束时间不能为空'}]}]" />
+          </a-form-item>
+        </row-item>
+        <row-item>
+          <a-form-item
+            label="工作优选权"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['level', {rules: [{required: true, message: '工作优选权不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in levelMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
         </row-item>
         <row-item>
           <a-form-item
@@ -234,6 +327,23 @@
             </a-upload>
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="资料文件"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-upload
+              :action="uploadUrl"
+              :multiple="true"
+              :file-list="defaultCheckFileList"
+              @change="handleCheckFileChange"
+              :headers="headers"
+            >
+              <a-button> <a-icon type="upload" /> 上传 </a-button>
+            </a-upload>
+          </a-form-item>
+        </row-item>
         <row-item v-show="refusedFlag">
           <a-form-item
             label="驳回原因"
@@ -283,13 +393,13 @@
         </row-item>-->
         <row-item>
           <a-form-item
-            label="故障描述"
+            label="委托内容描述"
             :labelCol="BaseTool.Constant.labelCol2"
             :wrapperCol="BaseTool.Constant.wrapperCol2"
           >
             <a-textarea
               :rows="4"
-              v-decorator="['content', {rules: [{required: true, message: '故障描述不能为空'}]}]"/>
+              v-decorator="['content', {rules: [{required: true, message: '委托内容描述不能为空'}]}]"/>
           </a-form-item>
         </row-item>
       </row-list>
@@ -305,7 +415,7 @@
 <script>
 import pick from 'lodash.pick'
 import BaseTool from '../../../../utils/tool'
-import { addRepairApplicationForm, updateRepairApplicationForm } from '@/api/repair/application-form'
+import { addRepairApplicationForm, updateRepairApplicationForm, getSbPositions } from '@/api/repair/application-form'
 import PartInfoSelectModal from '@/views/part/info/modules/PartInfoSelectModal'
 import SbInfoSelectModal from '@/views/sb/info/modules/SbInfoSelectModal'
 import { queryUser } from '@/api/upms/user'
@@ -324,6 +434,7 @@ export default {
       modalTitle: null,
       professorMap: {},
       repairTypeMap: {},
+      sbPositionList: [],
       form: this.$form.createForm(this),
       visible: false,
       sbId: null,
@@ -336,6 +447,7 @@ export default {
       needStopMap: {},
       category: 0,
       categoryMap: {},
+      trustMap: {},
       statusMap: {},
       userInfo: this.$store.getters.userInfo,
       userList: [],
@@ -362,15 +474,19 @@ export default {
   created () {
     // 下拉框map
     this.sourceMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_SOURCE)
-    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
+    // this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_LEVEL)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_STATUS)
     this.questionMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_QUESTION)
     this.needStopMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
+    this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.LEVEL_TYPE)
     this.categoryMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
+    this.trustMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.TRUST_DEPT_TYPE)
+    console.log(this.categoryMap)
     this.repairDeptMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_DEPT_CATEGORY)
     this.repairTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_TYPE)
     this.professorMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_PROFESSOR)
     this.getUsers()
+    this.getSbPositions()
   },
   methods: {
     base (record) {
@@ -452,6 +568,36 @@ export default {
         ])))
       })
     },
+    getSbPositions (parentId) {
+      getSbPositions({ parentId }).then(res => {
+        console.log(res)
+        this.sbPositionList = res.data.map(item => {
+          item = {
+            label: item.name,
+            value: item.name,
+            id: item.id,
+            isLeaf: false
+          }
+          return item
+        })
+      })
+    },
+    loadData (selectedOptions) {
+      console.log(selectedOptions)
+      const targetOption = selectedOptions[selectedOptions.length - 1]
+      targetOption.loading = true
+      getSbPositions({ parentId: targetOption.id }).then(res => {
+        targetOption.loading = false
+        targetOption.children = res.data.map(item => {
+          item = {
+            label: item.name,
+            value: item.name
+          }
+          return item
+        })
+        this.sbPositionList = [...this.sbPositionList]
+      })
+    },
     getUsers () {
       queryUser({ status: 1 }).then(res => {
         this.userList = res.data
@@ -468,11 +614,16 @@ export default {
         // 日期处理
         values.applyTime = this.BaseTool.Date.formatter(values.applyTime, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         values.limitDate = BaseTool.Date.formatter(values.limitDate, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
+        values.planStartTime = BaseTool.Date.formatter(values.planStartTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
+        values.planEndTime = BaseTool.Date.formatter(values.planEndTime, BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         // 上传文件
         values.repairFileList = this.repairFileList
+        values.repairProfessor = values.repairProfessor.join(',')
         values.repairType = values.repairType.join(',')
         values.applicationFileList = this.applicationFileList
         values.checkFileList = this.checkFileList
+        values.sbPosition = values.sbPosition.join('->')
+        console.log(values)
         if (values.partId === undefined) {
           values.partId = ''
         }
@@ -555,6 +706,10 @@ export default {
         }))
       })
     },
+    handleCheckFileChange (info) {
+      this.defaultCheckFileList = info.fileList
+      this.checkFileList = this.setFileList(info, 32)
+    },
     handleApplicationFileChange (info) {
       this.defaultApplicationFileList = info.fileList
       this.applicationFileList = this.setFileList(info, 11)

src/views/repair/application-form/modules/DetailRepair.vue

@@ -87,7 +87,7 @@
               <a-descriptions-item label="要求时间">{{ model.limitHours }}小时</a-descriptions-item>
               <a-descriptions-item label="送修部门">{{ model.name }}</a-descriptions-item>
               <a-descriptions-item label="维修工程师" >{{ model.checkUserName }}</a-descriptions-item>
-              <a-descriptions-item label="故障描述" :span="3"> <span v-html="model.content "></span><a-divider type="vertical" /><a @click="handleEdit(model)">编辑</a> </a-descriptions-item>
+              <a-descriptions-item label="委托内容描述" :span="3"> <span v-html="model.content "></span><a-divider type="vertical" /><a @click="handleEdit(model)">编辑</a> </a-descriptions-item>
               <a-descriptions-item label="报修图片" :span="3">
                 <div v-if="model.applicationFileList != null && model.applicationFileList.length > 0">
                   <viewer :images="model.applicationFileList" @inited="inited" ref="viewer" :index="1" >

src/views/repair/application-form/modules/TicketForm copy.vue

@@ -0,0 +1,354 @@
+<template>
+  <div class="main" v-show="visible">
+    <div>
+      <a-button type="primary" v-print="'#print-container2'" :disabled="disabled">打印</a-button>
+      <a-button style="margin-left: 8px" @click="handleCancel()">返回</a-button>
+    </div>
+    <div id="print-container2">
+      <div class="title">
+        <div style="font-size:26px; "><span style="font-size:32px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
+        <div style="font-size:12px;font-weight:700; "><span style="font-size:14px;vertical-align: middle;letter-spacing:.1em;">CATL-SICONG</span><span style="vertical-align: middle;transform: scale(0.8);"> LONGYAN SICONG Advanced Materials Technology Limited</span></div>
+        <div style="font-weight:700">检维修工作委托单（MSR）</div>
+      </div>
+      <div class="tables" >
+        <table>
+          <tr>
+            <td colspan="3">委托单位</td>
+            <td colspan="27">
+              <a-radio-group v-model="value1">
+                <a-radio :value="1">
+                  <a-icon class="check" v-show="value1 ==1" type="check" />生产部-{{ model.sbPositionName }}
+                </a-radio>
+                <a-radio :value="2">
+                  <a-icon class="check" v-show="value1 ==2" type="check" />研发部
+                </a-radio>
+                <a-radio :value="3">
+                  <a-icon class="check" v-show="value1 ==3" type="check" />安环部
+                </a-radio>
+                <a-radio :value="4">
+                  <a-icon class="check" v-show="value1 ==4" type="check" />质量部
+                </a-radio>
+                <a-radio :value="5">
+                  <a-icon class="check" v-show="value1 ==5" type="check" />人事行政部
+                </a-radio>
+                <a-radio :value="6">
+                  <a-icon class="check" v-show="value1 ==6" type="check" />其他
+                </a-radio>
+              </a-radio-group>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="3">检维修单位</td>
+            <td colspan="27">
+              <a-radio-group v-model="value2">
+                <a-radio :value="1">
+                  <a-icon class="check" v-show="value2 ==1" type="check" />机械
+                </a-radio>
+                <a-radio :value="2">
+                  <a-icon class="check" v-show="value2 ==2" type="check" />电气
+                </a-radio>
+                <a-radio :value="3">
+                  <a-icon class="check" v-show="value2 ==3" type="check" />仪表
+                </a-radio>
+                <a-radio :value="4">
+                  <a-icon class="check" v-show="value2 ==4" type="check" />保温保冷
+                </a-radio>
+                <a-radio :value="5">
+                  <a-icon class="check" v-show="value2 ==5" type="check" />防腐
+                </a-radio>
+                <a-radio :value="6">
+                  <a-icon class="check" v-show="value2 ==6" type="check" />安环
+                </a-radio>
+                <a-radio :value="7">
+                  <a-icon class="check" v-show="value2 ==7" type="check" />压力管道
+                </a-radio>
+                <a-radio :value="8">
+                  <a-icon class="check" v-show="value2 ==8" type="check" />其他
+                </a-radio>
+              </a-radio-group>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="3">委修单编号</td>
+            <td colspan="12">{{ this.model.repairNo }}</td>
+            <td colspan="3">委托时间</td>
+            <td colspan="12"> {{ this.model.callTime }}</td>
+          </tr>
+          <tr>
+            <td colspan="3">工作优选权</td>
+            <td colspan="27">
+              {{ model.requireHours }}小时
+              <!--              <a-radio-group v-model="value3">
+                <a-radio :value="1">
+                  <a-icon class="check" v-show="value3 ==1" type="check" />紧急
+                </a-radio>
+                <a-radio :value="2">
+                  <a-icon class="check" v-show="value3 ==2" type="check" />一日
+                </a-radio>
+                <a-radio :value="3">
+                  <a-icon class="check" v-show="value3 ==3" type="check" />三日
+                </a-radio>
+                <a-radio :value="4">
+                  <a-icon class="check" v-show="value3 ==4" type="check" />停机
+                </a-radio>
+                <a-radio :value="5">
+                  <a-icon class="check" v-show="value3 ==5" type="check" />待机
+                </a-radio>
+                <a-radio :value="6">
+                  <a-icon class="check" v-show="value3 ==6" type="check" />其它
+                </a-radio>
+              </a-radio-group>-->
+            </td>
+          </tr>
+          <tr>
+            <td colspan="3">工作类型</td>
+            <td colspan="27" >
+              <a-checkbox-group v-model="value4" @change="onChange">
+                <a-checkbox :value="1">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value4.includes(1)" type="check" /><span style="font-size: 13px;">普通作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="2">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value4.includes(2)" type="check" /><span style="font-size: 13px;">动火作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="3">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(3)" type="check" /><span style="font-size: 13px;">受限空间作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="4">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(4)" type="check" /><span style="font-size: 13px;">高处作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="5">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(5)" type="check" /><span style="font-size: 13px;">吊装作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="6">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(6)" type="check" /><span style="font-size: 13px;">动土作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="7">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(7)" type="check" /><span style="font-size: 13px;">断路作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="8">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(8)" type="check" /><span style="font-size: 13px;">设备检修作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="9">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(9)" type="check" /><span style="font-size: 13px;">盲板抽堵作业</span>
+                  </span></a-checkbox>
+              </a-checkbox-group></td>
+          </tr>
+          <tr>
+            <td colspan="3">设备位号</td>
+            <td colspan="9">{{ this.model.sbNo }}</td>
+            <td colspan="3">设备名称</td>
+            <td colspan="7"> {{ this.model.sbName }} </td>
+            <td colspan="1">车间具体位置</td>
+            <td colspan="9">{{ this.model.sbLocation }} </td>
+          </tr>
+          <tr >
+            <td colspan="1" rowspan="11" style="width: 10px;">委<br/>托<br/>单<br/>位<br/>填<br/>写</td>
+            <td colspan="14" >
+              <div>
+                1、委托内容描述：<br/>
+                <a-textarea v-model="value5" disabled="disabled" style="resize:none;border:none;" :rows="4"/>
+              </div>
+            </td>
+            <td colspan="1" rowspan="11" style="width: 10px;">检<br/>维<br/>修<br/>单<br/>位<br/>填<br/>写</td>
+            <td colspan="14" >
+              <div>
+                1、维修工作描述：<br/>
+                <a-textarea v-model="value6" style="resize:none;border:none;" :rows="4"/>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="14">2、需检维修单元状态</td>
+            <td colspan="14" rowspan="2">
+              <div>
+                2、检维修结果描述：<br/>
+                <a-textarea v-model="value7" style="resize:none;border:none;" :rows="4"/>
+              </div>
+            </td>
+          </tr>
+
+          <tr>
+            <td colspan="14" >
+              <a-checkbox-group v-model="value8" style="width:100%" @change="onChange">
+                <a-checkbox :value="1" disabled>
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(1)" type="check" />需检维修单元已经排放冲洗干净</span>
+                </a-checkbox >
+                <br/>
+                <a-checkbox :value="2" disabled>
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(2)" type="check" />需检维修单元已经隔离
+                  </span>
+                </a-checkbox >
+                <br/>
+                <a-checkbox :value="3" disabled>
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(3)" type="check" />需检维修单元设备已经停电</span>
+                </a-checkbox>
+                <br/>
+                <a-checkbox :value="4" disabled>
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(4)" type="check" />其他</span>
+                </a-checkbox >
+              </a-checkbox-group>
+            </td>
+          </tr>
+          <tr>
+            <td colspan="3">委修人</td>
+            <td colspan="4"> {{ this.model.caller }}</td>
+            <td colspan="3">确认可施工</td>
+            <td colspan="4"> </td>
+            <td colspan="3">派工工程师</td>
+            <td colspan="11"> {{ this.model.dispatcher }}</td>
+          </tr>
+          <tr>
+            <td colspan="3">委修主管</td>
+            <td colspan="4" style="width:70px"> </td>
+            <td colspan="3">完工时间</td>
+            <td colspan="4"> </td>
+            <td colspan="3">检维修人</td>
+            <td colspan="11">{{ this.model.repairMan }} </td>
+          </tr>
+          <tr>
+            <td colspan="3">特殊作业监护人</td>
+            <td colspan="11"> </td>
+            <td colspan="4"> </td>
+            <td colspan="3"> </td>
+            <td colspan="11"> </td>
+          </tr>
+          <tr>
+            <td colspan="3">特殊作业核准</td>
+            <td colspan="11"> </td>
+            <td colspan="4"> </td>
+            <td colspan="3"> </td>
+            <td colspan="11"> </td>
+          </tr>
+          <tr>
+            <td colspan="3">验收合格</td>
+            <td colspan="11"> </td>
+            <td colspan="3">工时统计</td>
+            <td colspan="4"> </td>
+            <td colspan="3">主管签字</td>
+            <td colspan="4" style="width:70px"></td>
+          </tr>
+        </table>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script>
+import { stringify } from 'qs'
+export default {
+  data () {
+    return {
+      visible: false,
+      disabled: false,
+      value1: 1,
+      value2: null,
+      value3: null,
+      value4: [],
+      value5: null,
+      value6: null,
+      value7: null,
+      value8: [],
+      model: {
+        'repairNo': null,
+        'callTime': null,
+        'sbNo': null,
+        'sbName': null,
+        'sbLocation': null,
+        'caller': null,
+        'dispatcher': null,
+        'repairMan': null,
+        'content': null,
+        'sbPositionName': null,
+        'requireHours': null,
+        'repairProfessor': null,
+        'repairType': null
+      }
+    }
+  },
+  methods: {
+    onChange (checkedValues) {
+      console.log(this.value8, this.value8.includes(1))
+    },
+    base (record) {
+      this.visible = true
+      this.model = record
+      this.value2 = this.model.repairProfessor
+      this.value4 = this.model.repairType
+      this.value5 = this.model.content
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.$emit('ok')
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.main{
+  background: #fff;
+}
+.title{
+  text-align: center;
+  font-size:18px;
+}
+.tables{
+  margin: 10px auto;
+   width: 1030px;
+  height: 600px;
+  font-size: 14px;
+  overflow-x:auto;
+  table {
+        min-width:100%;
+        margin: 0 auto;
+        border: 1px solid #D6D6D6;
+        border-radius: 6px;
+        border-collapse: collapse;
+        font-weight: 400;
+        table-layout:fixed;
+    }
+    th{
+      color: #FFFFFF;
+      background: #3762FC;
+    }
+    tr {
+      height:26px;
+    }
+    th,
+    td {
+        border: 1px solid #D6D6D6;
+        // text-align: center;
+        padding: 2px 10px;
+        white-space: nowrap;
+    }
+}
+.check{
+  position:absolute;
+  left:0px;
+  font-size:20px;
+}
+.checks{
+  position:absolute;
+  left:-27px;
+  font-size:20px;
+}
+/deep/.ant-radio-inner::after ,/deep/.ant-checkbox-checked .ant-checkbox-inner{
+  background-color:#fff
+}
+</style>

src/views/repair/application-form/modules/TicketForm.vue

@@ -6,18 +6,19 @@
     </div>
     <div id="print-container2">
       <div class="title">
-        <div style="font-size:26px; "><span style="font-size:32px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
-        <div style="font-size:12px;font-weight:700; "><span style="font-size:14px;vertical-align: middle;letter-spacing:.1em;">CATL-SICONG</span><span style="vertical-align: middle;transform: scale(0.8);"> LONGYAN SICONG Advanced Materials Technology Limited</span></div>
+        <div style="font-size:20px; "><span style="font-size:26px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康</span><span style="vertical-align: middle;">龙岩思康新材料有限公司</span></div>
+        <!-- <div style="font-size:12px;font-weight:700; "><span style="font-size:14px;vertical-align: middle;letter-spacing:.1em;">CATL-SICONG</span><span style="vertical-align: middle;transform: scale(0.8);"> LONGYAN SICONG Advanced Materials Technology Limited</span></div> -->
         <div style="font-weight:700">检维修工作委托单（MSR）</div>
       </div>
       <div class="tables" >
+        <div style="position:absolute;top: -20px;right:0">委修单编号:{{ this.model.repairNo }}</div>
         <table>
           <tr>
             <td colspan="3">委托单位</td>
             <td colspan="27">
               <a-radio-group v-model="value1">
                 <a-radio :value="1">
-                  <a-icon class="check" v-show="value1 ==1" type="check" />生产部-{{ model.sbPositionName }}
+                  <a-icon class="check" v-show="value1 ==1" type="check" />生产部
                 </a-radio>
                 <a-radio :value="2">
                   <a-icon class="check" v-show="value1 ==2" type="check" />研发部
@@ -28,9 +29,6 @@
                 <a-radio :value="4">
                   <a-icon class="check" v-show="value1 ==4" type="check" />质量部
                 </a-radio>
-                <a-radio :value="5">
-                  <a-icon class="check" v-show="value1 ==5" type="check" />人事行政部
-                </a-radio>
                 <a-radio :value="6">
                   <a-icon class="check" v-show="value1 ==6" type="check" />其他
                 </a-radio>
@@ -38,71 +36,90 @@
             </td>
           </tr>
           <tr>
-            <td colspan="3">检维修单位</td>
+            <td colspan="3">维修专业</td>
             <td colspan="27">
-              <a-radio-group v-model="value2">
-                <a-radio :value="1">
-                  <a-icon class="check" v-show="value2 ==1" type="check" />机械
-                </a-radio>
-                <a-radio :value="2">
-                  <a-icon class="check" v-show="value2 ==2" type="check" />电气
-                </a-radio>
-                <a-radio :value="3">
-                  <a-icon class="check" v-show="value2 ==3" type="check" />仪表
-                </a-radio>
-                <a-radio :value="4">
-                  <a-icon class="check" v-show="value2 ==4" type="check" />保温保冷
-                </a-radio>
-                <a-radio :value="5">
-                  <a-icon class="check" v-show="value2 ==5" type="check" />防腐
-                </a-radio>
-                <a-radio :value="6">
-                  <a-icon class="check" v-show="value2 ==6" type="check" />安环
-                </a-radio>
-                <a-radio :value="7">
-                  <a-icon class="check" v-show="value2 ==7" type="check" />压力管道
-                </a-radio>
-                <a-radio :value="8">
-                  <a-icon class="check" v-show="value2 ==8" type="check" />其他
-                </a-radio>
-              </a-radio-group>
+              <a-checkbox-group v-model="value2" @change="onChange">
+                <a-checkbox :value="1">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value2.includes(1)" type="check" /><span style="font-size: 13px;">静设备</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="2">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value2.includes(2)" type="check" /><span style="font-size: 13px;">动设备</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="3">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(3)" type="check" /><span style="font-size: 13px;">电气</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="4">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(4)" type="check" /><span style="font-size: 13px;">仪表</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="5">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(5)" type="check" /><span style="font-size: 13px;">保温保冷</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="6">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(6)" type="check" /><span style="font-size: 13px;">防腐</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="7">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(7)" type="check" /><span style="font-size: 13px;">特种设备</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="8">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(8)" type="check" /><span style="font-size: 13px;">脚手架</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="9">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value2.includes(9)" type="check" /><span style="font-size: 13px;">其他</span>
+                  </span></a-checkbox>
+              </a-checkbox-group>
             </td>
           </tr>
           <tr>
-            <td colspan="3">委修单编号</td>
-            <td colspan="12">{{ this.model.repairNo }}</td>
+            <td colspan="3">生产装置</td>
+            <td colspan="12"></td>
             <td colspan="3">委托时间</td>
             <td colspan="12"> {{ this.model.callTime }}</td>
           </tr>
           <tr>
             <td colspan="3">工作优选权</td>
             <td colspan="27">
-              {{ model.requireHours }}小时
-              <!--              <a-radio-group v-model="value3">
+              <!-- {{ model.requireHours }}小时 -->
+              <a-radio-group v-model="value3">
                 <a-radio :value="1">
-                  <a-icon class="check" v-show="value3 ==1" type="check" />紧急
+                  <a-icon class="check" v-show="value3 ==1" type="check" />24小时内
                 </a-radio>
                 <a-radio :value="2">
-                  <a-icon class="check" v-show="value3 ==2" type="check" />一日
+                  <a-icon class="check" v-show="value3 ==2" type="check" />3天内
                 </a-radio>
                 <a-radio :value="3">
-                  <a-icon class="check" v-show="value3 ==3" type="check" />三日
+                  <a-icon class="check" v-show="value3 ==3" type="check" />7天内
                 </a-radio>
                 <a-radio :value="4">
-                  <a-icon class="check" v-show="value3 ==4" type="check" />停机
+                  <a-icon class="check" v-show="value3 ==4" type="check" />一个月内
                 </a-radio>
                 <a-radio :value="5">
-                  <a-icon class="check" v-show="value3 ==5" type="check" />待机
+                  <a-icon class="check" v-show="value3 ==5" type="check" />一个月后
                 </a-radio>
                 <a-radio :value="6">
-                  <a-icon class="check" v-show="value3 ==6" type="check" />其它
+                  <a-icon class="check" v-show="value3 ==6" type="check" />大修
                 </a-radio>
-              </a-radio-group>-->
+              </a-radio-group>
             </td>
           </tr>
           <tr>
-            <td colspan="3">工作类型</td>
-            <td colspan="27" >
+            <td colspan="3" rowspan="2">特殊作业类型</td>
+            <td colspan="27" style="text-align:center">
               <a-checkbox-group v-model="value4" @change="onChange">
                 <a-checkbox :value="1">
                   <span style="position:relative">
@@ -127,6 +144,58 @@
 
                     <a-icon class="checks" v-show="value4.includes(5)" type="check" /><span style="font-size: 13px;">吊装作业</span>
                   </span></a-checkbox>
+                <a-checkbox :value="6" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(6)" type="check" /><span style="font-size: 13px;">动土作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="7" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(7)" type="check" /><span style="font-size: 13px;">断路作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="8" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(8)" type="check" /><span style="font-size: 13px;">设备检修作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="9" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(9)" type="check" /><span style="font-size: 13px;">盲板抽堵作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="10" v-show="false">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value4.includes(10)" type="check" /><span style="font-size: 13px;">管线、设备打开作业</span>
+                  </span></a-checkbox>
+              </a-checkbox-group></td>
+          </tr>
+          <tr>
+            <td colspan="27" style="text-align:center">
+              <a-checkbox-group v-model="value4" @change="onChange">
+                <a-checkbox :value="1" v-show="false">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value4.includes(1)" type="check" /><span style="font-size: 13px;">普通作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="2" v-show="false">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value4.includes(2)" type="check" /><span style="font-size: 13px;">动火作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="3" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(3)" type="check" /><span style="font-size: 13px;">受限空间作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="4" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(4)" type="check" /><span style="font-size: 13px;">高处作业</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="5" v-show="false">
+                  <span style="position:relative">
+
+                    <a-icon class="checks" v-show="value4.includes(5)" type="check" /><span style="font-size: 13px;">吊装作业</span>
+                  </span></a-checkbox>
                 <a-checkbox :value="6">
                   <span style="position:relative">
 
@@ -147,101 +216,145 @@
 
                     <a-icon class="checks" v-show="value4.includes(9)" type="check" /><span style="font-size: 13px;">盲板抽堵作业</span>
                   </span></a-checkbox>
+                <a-checkbox :value="10">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value4.includes(10)" type="check" /><span style="font-size: 13px;">管线、设备打开作业</span>
+                  </span></a-checkbox>
               </a-checkbox-group></td>
           </tr>
           <tr>
             <td colspan="3">设备位号</td>
-            <td colspan="9">{{ this.model.sbNo }}</td>
+            <td colspan="7">{{ this.model.sbNo }}</td>
             <td colspan="3">设备名称</td>
             <td colspan="7"> {{ this.model.sbName }} </td>
-            <td colspan="1">车间具体位置</td>
-            <td colspan="9">{{ this.model.sbLocation }} </td>
+            <td colspan="3">车间具体位置</td>
+            <td colspan="7">{{ this.model.sbLocation }} </td>
           </tr>
           <tr >
-            <td colspan="1" rowspan="11" style="width: 10px;">委<br/>托<br/>单<br/>位<br/>填<br/>写</td>
-            <td colspan="14" >
+            <td colspan="29" >
               <div>
                 1、委托内容描述：<br/>
-                <a-textarea v-model="value5" disabled="disabled" style="resize:none;border:none;" :rows="4"/>
-              </div>
-            </td>
-            <td colspan="1" rowspan="11" style="width: 10px;">检<br/>维<br/>修<br/>单<br/>位<br/>填<br/>写</td>
-            <td colspan="14" >
-              <div>
-                1、维修工作描述：<br/>
-                <a-textarea v-model="value6" style="resize:none;border:none;" :rows="4"/>
-              </div>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="14">2、需检维修单元状态</td>
-            <td colspan="14" rowspan="2">
-              <div>
-                2、检维修结果描述：<br/>
-                <a-textarea v-model="value7" style="resize:none;border:none;" :rows="4"/>
+                <a-textarea v-model="value5" disabled="disabled" style="resize:none;border:none;width:100%;" :rows="4"/>
               </div>
             </td>
+            <td colspan="1" rowspan="4" style="width: 10px;">委<br/>托<br/>单<br/>位<br/>填<br/>写</td>
           </tr>
-
           <tr>
-            <td colspan="14" >
-              <a-checkbox-group v-model="value8" style="width:100%" @change="onChange">
-                <a-checkbox :value="1" disabled>
-                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(1)" type="check" />需检维修单元已经排放冲洗干净</span>
-                </a-checkbox >
-                <br/>
-                <a-checkbox :value="2" disabled>
-                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(2)" type="check" />需检维修单元已经隔离
+            <td colspan="29">
+              2、需检维修单元状态：<br />
+              <a-checkbox-group v-model="value8">
+                <a-checkbox :value="1">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value8.includes(1)" type="check" /><span style="font-size: 13px;">已经排放冲洗干净</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="2" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(2)" type="check" />已经物料隔离
                   </span>
                 </a-checkbox >
-                <br/>
-                <a-checkbox :value="3" disabled>
-                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(3)" type="check" />需检维修单元设备已经停电</span>
+                <a-checkbox :value="3" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(3)" type="check" />设备已经停电挂牌上锁</span>
                 </a-checkbox>
-                <br/>
-                <a-checkbox :value="4" disabled>
-                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(4)" type="check" />其他</span>
+                <a-checkbox :value="4" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value8.includes(4)" type="check" />其他（<a-input style="width:200px" placeholder="委修人确认" />）</span>
                 </a-checkbox >
               </a-checkbox-group>
             </td>
           </tr>
           <tr>
-            <td colspan="3">委修人</td>
-            <td colspan="4"> {{ this.model.caller }}</td>
-            <td colspan="3">确认可施工</td>
-            <td colspan="4"> </td>
-            <td colspan="3">派工工程师</td>
-            <td colspan="11"> {{ this.model.dispatcher }}</td>
+            <td colspan="29" >
+              <div style="display:flex;justify-content:space-around">
+                <div style="flex:1">委修人:{{ this.model.caller }}</div>
+                <div style="flex:1">委修主管:</div>
+                <div style="flex:1">特殊作业监护人:<a-input style="width:150px" placeholder="属地监护 " /></div>
+                <div style="flex:1">确认完工:<a-input style="width:150px" placeholder="属地验收人" /></div>
+              </div>
+            </td>
           </tr>
           <tr>
-            <td colspan="3">委修主管</td>
-            <td colspan="4" style="width:70px"> </td>
-            <td colspan="3">完工时间</td>
-            <td colspan="4"> </td>
-            <td colspan="3">检维修人</td>
-            <td colspan="11">{{ this.model.repairMan }} </td>
+            <td colspan="29" >
+              <div>
+
+                计划开始时间:<a-date-picker style="min-width:30px;" show-time placeholder="选择时间" suffixIcon=" "/>
+                计划完工时间:
+                <a-date-picker style="min-width:30px;" show-time placeholder="选择时间" suffixIcon=" "/><br>
+                实际开始时间:
+                <a-date-picker style="min-width:30px;" show-time placeholder="选择时间" suffixIcon=" "/>
+                实际结束时间:
+                <a-date-picker style="min-width:30px;" show-time placeholder="选择时间" suffixIcon=" "/>
+              </div>
+            </td>
+          </tr>
+          <tr >
+            <td colspan="29" >
+              <div>
+                1、维修工作描述：（派工工程师填写）<br/>
+                <a-textarea
+                  v-model="value6"
+                  style="resize:none;border:none;width:100%;"
+                  :rows="4"
+                  placeholder="（1）判断故障原因或明确改造内容；
+（2）简述维修方案或施工方案、步骤，分解工单任务；分解搭架、保温、其他专业维修需求等辅助工作；
+（3）维修/施工计划，使用人工时、机械台班；（后续制定相应作业维修包）；
+（4）所需备件。"
+                />
+              </div>
+            </td>
+            <td colspan="1" rowspan="5" style="width: 10px;">检<br/>维<br/>修<br/>单<br/>位<br/>填<br/>写</td>
+          </tr>
+          <tr>
+            <td colspan="29" >
+              <div>
+                2、检修结果描述：（检维修人填写）<br/>
+                <a-textarea
+                  v-model="value9"
+                  style="resize:none;border:none;width:100%;"
+                  :rows="4"
+                  placeholder="（1）检修前、技改施工前数据确认；
+（2）维修/施工步骤记录（检修数据或照片、损坏部位的微距拍摄；
+（3）维修/施工结果，使用人工时、机械台班；
+（4）实际消耗备件。"
+                />
+              </div>
+            </td>
           </tr>
           <tr>
-            <td colspan="3">特殊作业监护人</td>
-            <td colspan="11"> </td>
-            <td colspan="4"> </td>
-            <td colspan="3"> </td>
-            <td colspan="11"> </td>
+            <td colspan="29" style="line-height:37px;">
+              3、故障部位：<a-textarea style="resize:none;border:none;width:87%;" placeholder="派工工程师填写" :rows="1" v-model="value6"/>
+            </td>
           </tr>
           <tr>
-            <td colspan="3">特殊作业核准</td>
-            <td colspan="11"> </td>
-            <td colspan="4"> </td>
-            <td colspan="3"> </td>
-            <td colspan="11"> </td>
+            <td colspan="29" >
+              4、故障原因：
+              <a-checkbox-group v-model="value10">
+                <a-checkbox :value="1">
+                  <span style="position:relative">
+                    <a-icon class="checks" v-show="value10.includes(1)" type="check" /><span style="font-size: 13px;">操作原因</span>
+                  </span></a-checkbox>
+                <a-checkbox :value="2" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value10.includes(2)" type="check" />质量问题
+                  </span>
+                </a-checkbox >
+                <a-checkbox :value="3" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value10.includes(3)" type="check" />工艺问题</span>
+                </a-checkbox>
+                <a-checkbox :value="4" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value10.includes(4)" type="check" />使用寿命</span>
+                </a-checkbox>
+                <a-checkbox :value="5" >
+                  <span style="position:relative"><a-icon class="checks" v-show="value10.includes(5)" type="check" />需分析（<a-input style="width:200px" placeholder="派工工程师填写" />）</span>
+                </a-checkbox >
+              </a-checkbox-group>
+            </td>
           </tr>
           <tr>
-            <td colspan="3">验收合格</td>
-            <td colspan="11"> </td>
-            <td colspan="3">工时统计</td>
-            <td colspan="4"> </td>
-            <td colspan="3">主管签字</td>
-            <td colspan="4" style="width:70px"></td>
+            <td colspan="29" >
+              <div style="display:flex;justify-content:space-around">
+                <div style="flex:1">派工工程师:</div>
+                <div style="flex:1">检维修人:</div>
+                <div style="flex:1">工时统计:<a-input style="width:150px" placeholder="检维修人填写" /></div>
+                <div style="flex:1">主管确认:</div>
+              </div>
+            </td>
           </tr>
         </table>
       </div>
@@ -257,13 +370,15 @@ export default {
       visible: false,
       disabled: false,
       value1: 1,
-      value2: null,
+      value2: [],
       value3: null,
       value4: [],
       value5: null,
       value6: null,
       value7: null,
       value8: [],
+      value9: null,
+      value10: [],
       model: {
         'repairNo': null,
         'callTime': null,
@@ -288,7 +403,7 @@ export default {
     base (record) {
       this.visible = true
       this.model = record
-      this.value2 = this.model.repairProfessor
+      this.value2 = [this.model.repairProfessor]
       this.value4 = this.model.repairType
       this.value5 = this.model.content
     },
@@ -310,10 +425,10 @@ export default {
 }
 .tables{
   margin: 10px auto;
-   width: 1030px;
-  height: 600px;
+   width: 830px;
+  // height: 600px;
   font-size: 14px;
-  overflow-x:auto;
+  position: relative;
   table {
         min-width:100%;
         margin: 0 auto;
@@ -328,7 +443,7 @@ export default {
       background: #3762FC;
     }
     tr {
-      height:26px;
+      height:37px;
     }
     th,
     td {
@@ -351,4 +466,11 @@ export default {
 /deep/.ant-radio-inner::after ,/deep/.ant-checkbox-checked .ant-checkbox-inner{
   background-color:#fff
 }
+/deep/ .ant-input {
+  width: 200px;
+  border:none;
+}
+/deep/.ant-calendar-picker{
+  min-width: 30px !important;
+}
 </style>