合并分支 'dev_third_stage' 到 'master'

Dev third stage 查看合并请求 laws-nio/laws-weilai!158
2022-08-25 23:46:45 +08:00
parent 7378b41e84 63ace4060b
commit 99b578fbf4
45 changed files with 515 additions and 138 deletions
@@ -107,7 +107,7 @@
          <img v-else-if="item.status == 2" src="../../../assets/shijian.png" class="process-content-left" alt="">
          <img v-else-if="item.status == 3" src="../../../assets/xian.png" class="process-content-left" alt="">
          <div class="process-content-right">
-            <div class="process-content-right-top">{{item.name}}</div>
+            <div class="process-content-right-top" :title="item.name">{{item.name}}</div>
            <div class="process-content-right-button">{{item.time?item.time.slice(0,11): item.time}}</div>
          </div>
        </div>
@@ -112,7 +112,7 @@
                {{$t('edit')}}
          </a>
        </span>
-        <span slot="regulatoryEngineer" >
+        <span slot="regulatoryEngineer">
            <span :title="$t('regulatoryEngineer')">
              {{$t('regulatoryEngineer')}}
            </span>
@@ -218,6 +218,7 @@
                <!--                :prop="'certificationEngineer'"-->
                <a-form-model-item class="itemModel">
                  <a-select allowClear
+                            class="box-input"
                            v-model="formInline.certificationEngineer"
                            :placeholder="$t('certifiedEngineer')+$t('areaOfResponsibility')">
                    <a-select-option v-for="(item, key) in dictOptionsValue"
@@ -283,18 +284,18 @@
          {
            align: 'center',
            dataIndex: 'lawEngineerName',
-            slots:{title:'regulatoryEngineer'},
+            slots: { title: 'regulatoryEngineer' },
            ellipsis: true
          },
          {
            align: 'center',
-            slots:{title:'engineeringInterfacePerson'},
+            slots: { title: 'engineeringInterfacePerson' },
            dataIndex: 'engineeringInterfacePersonName',
            ellipsis: true
          },
          {
            align: 'center',
-            slots:{title:'certifiedEngineer'},
+            slots: { title: 'certifiedEngineer' },
            dataIndex: 'certificationEngineerName',
            ellipsis: true
          },
@@ -417,10 +418,10 @@
        this.selectedRowKeys = []
        this.getList()
      },
-      handleCancel(){
+      handleCancel() {
        this.visible = false
      },
-      handleSubmit(){
+      handleSubmit() {
        this.visible = false
      },
      batSettingClick() {
@@ -469,6 +470,9 @@
        this.editVisible = true
        this.$nextTick(() => {
          this.formInline = JSON.parse(JSON.stringify(item))
+          if (!(this.dictOptionsValue.some(val => val.certificationEngineer == this.formInline.certificationEngineer))) {
+            this.formInline.certificationEngineer = undefined
+          }
          this.$refs.ruleForm.clearValidate()
        })
      },
@@ -642,11 +646,12 @@
    height: 38px;
    /*margin-top: 2px;*/
  }
+
  .drawer-bootom-button {
    position: absolute;
    bottom: 0;
    width: 100%;
-    z-index:100;
+    z-index: 100;
    border-top: 1px solid #e8e8e8;
    padding: 10px 16px;
    text-align: right;
@@ -353,7 +353,7 @@
        postAction(this.url.list, query).then((res) => {
          if (res.success) {
            if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = res.result.current - 1
+              this.pageNo = 1
              this.getList()
              return
            }
@@ -342,6 +342,11 @@
        this.loading = true
        getAction(this.url.page, query).then((res) => {
          if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
            this.dataSource = res.result.records || []
            this.total = res.result.total
            this.loading = false