Browse Source

LY bug fix

ly 2 years ago
parent
commit
c4746b6ab8

+ 18 - 5
ui/src/views/ehs/jobticket/index.vue

@@ -251,8 +251,8 @@
     />
 
     <!-- 添加或修改工作票对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <el-form-item :label="$t('开票日期')" prop="kprq">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.kprq"
@@ -309,6 +309,22 @@
         <el-form-item :label="$t('限制空间许可证号')" prop="xzkjxkzh">
           <el-input v-model="form.xzkjxkzh" :placeholder="$t('请输入') + $t('限制空间许可证号')"/>
         </el-form-item>
+        <el-form-item :label="$t('盲板作业许可证号')" prop="mbzyxkzh">
+          <el-input v-model="form.mbzyxkzh" :placeholder="$t('请输入') + $t('盲板作业许可证号')"/>
+        </el-form-item>
+        <el-form-item :label="$t('高处作业许可证号')" prop="gczyxkzh">
+          <el-input v-model="form.gczyxkzh" :placeholder="$t('请输入') + $t('高处作业许可证号')"/>
+        </el-form-item>
+        <el-form-item :label="$t('高处作业级别')" prop="hpjb">
+          <el-select v-model="form.gczyjb" :placeholder="$t('请选择') + $t('高处作业级别')">
+            <el-option
+              v-for="dict in gczyjbOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('内容')" prop="content">
           <el-input v-model="form.content" :placeholder="$t('请输入') + $t('内容')"/>
         </el-form-item>
@@ -903,7 +919,6 @@ export default {
       this.form = row;
       row.zypzt = 10;
       this.form.zypzt = 10;
-
       updateJobticket(this.form).then(response => {
         this.msgSuccess(this.$t('修改成功'));
         this.open = false;
@@ -939,9 +954,7 @@ export default {
     },
     wcxztYOU(index, row) {
       this.form = row;
-
       this.form.wcxzt = 10;
-
       updateJobticket(this.form).then(response => {
         this.msgSuccess(this.$t('修改成功'));
         this.open = false;

+ 1 - 1
ui/src/views/invoice/bookingworkticket/index.vue

@@ -160,7 +160,7 @@
           <span>{{ parseTime(scope.row.bookingworkticket.createdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
+      <el-table-column label="预约状态" align="center" prop="bookingworkticket.status" :formatter="statusFormat" />
       <el-table-column label="票号"  align="center" prop="reservationNumber" >
          <template slot-scope="scope">
          <span>  {{scope.row.reservationNumber}}</span>