优化接口按钮中

src/views/bjd/dj_input.vue

@@ -350,7 +350,7 @@
                     {
                       required: true,
                       message:
-                        '报检人电话不能为空，该电话用于短信通知企业网上交费。',
+                        '报检人电话不能为空。',
                       trigger: 'change',
                     },
                   ]"
@@ -1627,9 +1627,6 @@ export default {
       this.templateName = '安全阀报检导入模板.xlsx'
     }
     // 区划跟科室加载完成后读取关联数据
-    if (this.formState === 'create' || this.formState === 'newBuild') {
-      this.getBjdDepartment()
-    }
     this.getJylb()
     this.getArea()
     this.getDepts()
@@ -1869,30 +1866,23 @@ export default {
         this.jylbs = data
       })
     },
+    /**
+     * 查询科室
+     */
     getDepts() {
-      // 查询科室
       this.api({
         url: '/department/all',
         method: 'get',
         params: {
-          shebeizhongleidaima: this.bjd.shebeizhongleidaima
+          shebeizhongleidaima: this.bjd.shebeizhongleidaima,
+          quhuadaima: this.bjd.quhuadaima,
+          jianyanleibie: 'JJ'
         }
-      }).then((data) => {
+      }).then(data => {
         this.depts = data
-      })
+        if (this.formState === 'create') {
-    },
+          this.bjdDepartment = this.depts[0]
-    getBjdDepartment() {
+          this.$set(this.bjd, 'departmentId', this.bjdDepartment.id)
-      this.bjdDepartment.shebeizhonglei = this.bjd.shebeizhongleidaima
-      this.bjdDepartment.jianyanleibie = this.bjd.jianyanleibie
-      this.bjdDepartment.quhumingcheng = this.bjd.quhuadaima
-      this.apibjd({
-        url: '/bjdDepartment/getBjdDepartment',
-        method: 'get',
-        params: this.bjdDepartment
-      }).then((data) => {
-        if (data != null) {
-          this.bjdDepartment = data
-          this.$set(this.bjd, 'departmentId', this.bjdDepartment.departmentId)
         }
       })
     },

src/views/bjd/jj_input.vue

@@ -10,24 +10,6 @@
             <el-button type="success" icon="el-icon-edit" size="medium" @click="bjdSave(false)">
               更新/核价
             </el-button>
-            <template v-if="sbzldm === '3000' || sbzldm === '4000'">
-              <el-button type="primary" icon="el-icon-circle-check-outline" size="medium" @click="openZiliaoshencha()">
-                资料审查
-              </el-button>
-              <el-button type="info" icon="el-icon-circle-check-outline" size="medium" @click="bztz()">
-                补证通知
-              </el-button>
-              <template v-if="bjd.byslState">
-                <el-button type="danger" icon="el-icon-circle-check-outline" size="medium" @click="bysl()">
-                  不予受理
-                </el-button>
-              </template>
-              <template v-else>
-                <el-button type="danger" disabled icon="el-icon-circle-check-outline" size="medium">
-                  不予受理
-                </el-button>
-              </template>
-            </template>
             <el-button type="warning" icon="el-icon-circle-check-outline" size="medium" @click="bjdSave(true)">
               审核通过
             </el-button>
@@ -46,9 +28,6 @@
           </template>
         </template>
         <template v-else>
-          <el-button v-if="sbzldm === '3000' || sbzldm === '4000'" type="primary" icon="el-icon-circle-check-outline" size="medium" @click="openZiliaoshencha()">
-            资料查看
-          </el-button>
           <el-button type="success" icon="el-icon-printer" @click="viewHzd">
             打印回执单
           </el-button>
@@ -186,70 +165,57 @@
             </div>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item :rules="[{ required: true, message: '报检人电话不能为空，该电话用于短信通知企业网上交费。', trigger: 'change'}]" label="报检人电话:" prop="baojiandianhua">
+                <el-form-item :rules="[{ required: true, message: '报检人电话不能为空。', trigger: 'change'}]" label="报检人电话:" prop="baojiandianhua">
                   <el-input v-model="bjd.baojiandianhua" type="text" />
                 </el-form-item>
               </el-col>
-            </el-row>
-          </fieldset>
-          <fieldset>
-            <legend>非税系统交费信息</legend>
-            <el-row :gutter="20">
-              <el-col :span="18">
-                <span style="color: red;font-size: 20px;">请正确填写发票信息中的内容和收取电子发票的邮箱地址</span>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="缴费单位全称:" prop="jiaokuandanwei">
+                <el-form-item
-                  <el-input v-model="bjd.jiaokuandanwei" type="text" />
+                  :rules="[
-                </el-form-item>
+                    {
-              </el-col>
+                      required: true,
-              <el-col :span="9">
+                      message: '检验科室电话不能为空',
-                <el-form-item label="接收发票邮箱:" :rules="[{ required: false, message: '请输入邮箱地址', trigger: 'blur' },{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]" prop="jiaokuanyouxiang">
+                      trigger: 'change',
-                  <el-input v-model="bjd.jiaokuanyouxiang" />
+                    },
-                </el-form-item>
+                  ]"
-              </el-col>
+                  label="检验科室电话:"
-            </el-row>
+                  prop="departmentDianhua"
-            <el-row :gutter="20">
+                >
-              <el-col :span="9">
+                  <el-input v-model="bjd.departmentDianhua" type="text" />
-                <el-form-item label="联系人:" prop="jiaokuanren">
-                  <el-input v-model="bjd.jiaokuanren" type="text" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="9">
-                <el-form-item label="联系电话:" prop="jiaokuandianhua">
-                  <el-input v-model="bjd.jiaokuandianhua" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="查询报检电话:" prop="baojiandianhua">
+                <el-form-item
-                  <el-input v-model="bjd.baojiandianhua" type="text" />
+                  :rules="[
-                </el-form-item>
+                    {
-              </el-col>
+                      required: true,
-              <el-col :span="9">
+                      message: '报告查询电话不能为空',
-                <el-form-item label="缴款码:" prop="jiaokuanma">
+                      trigger: 'change',
-                  <el-input v-model="bjd.jiaokuanma" disabled />
+                    },
+                  ]"
+                  label="报告查询电话:"
+                  prop="reportQueryDianhua"
+                >
+                  <el-input v-model="bjd.reportQueryDianhua" type="text" />
                 </el-form-item>
               </el-col>
-            </el-row>
-          </fieldset>
-          <fieldset>
-            <legend>领取信息</legend>
-            <el-row :gutter="20">
               <el-col :span="9">
-                <el-form-item label="领取方式:" prop="lingqufangshi">
+                <el-form-item
-                  <el-select v-model="bjd.lingqufangshi" style="width: 240px;" @change="lqfsChange">
+                  :rules="[
-                    <el-option label="自取" value="自取" />
+                    {
-                    <el-option label="自打印" value="自打印" />
+                      required: true,
-                  </el-select>
+                      message: '报检受理电话不能为空',
+                      trigger: 'change',
+                    },
+                  ]"
+                  label="报检受理电话:"
+                  prop="inspectionAcceptanceDianhua"
+                >
+                  <el-input v-model="bjd.inspectionAcceptanceDianhua" type="text" />
                 </el-form-item>
               </el-col>
-              <el-button v-if="bjd.lingqufangshi === '邮寄'" type="warning" icon="el-icon-circle-check-outline" size="medium" @click="postInfoSave">
-                修改地址
-              </el-button>
             </el-row>
           </fieldset>
         </el-form>
@@ -652,40 +618,6 @@
         </el-table>
         <pagination v-show="totalCount>0" :total="totalCount" :page-num.sync="listQuery.pageNum" :page-row.sync="listQuery.pageRow" @pagination="getBaseList" />
       </el-dialog>
-      <el-dialog title="邮寄信息" width="800px" :visible.sync="formYJVisible" @close="formYJVisible = false">
-        <el-form ref="postInfo" :model="postInfo" label-position="right" label-width="120px">
-          <el-row :gutter="20">
-            <el-col :span="22">
-              <el-form-item label="使用单位:" prop="shiyongdanwei">
-                <el-input v-model="postInfo.shiyongdanwei" type="text" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="11">
-              <el-form-item label="收件人姓名:" prop="nickname">
-                <el-input v-model="postInfo.nickname" type="text" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="11">
-              <el-form-item label="收件人电话:" prop="tel">
-                <el-input v-model="postInfo.tel" type="text" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="22">
-              <el-form-item label="收件人地址:" prop="addr">
-                <el-input v-model="postInfo.addr" type="text" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <span slot="footer" class="dialog-footer">
-          <el-button @click="formYJVisible = false">取 消</el-button>
-          <el-button type="primary" @click="savePostInfo()">确 定</el-button>
-        </span>
-      </el-dialog>
     </el-tabs>
     <el-dialog title="原始材料内容比对" width="98%" top="5px" :visible.sync="baseInfoContentVisible" :close-on-press-escape="false" @close="baseInfoContentVisible = false">
       <el-container style="border: 1px solid #eee;height:700px">
@@ -768,7 +700,6 @@ export default {
         shebeizhongleidaima: this.$route.params.sbzldm,
         quhuamingcheng: '',
         quhuadaima: '',
-        lingqufangshi: '自取',
         bjType: this.$route.query.bjType
       },
       param: {
@@ -846,8 +777,9 @@ export default {
   created() {
     if (this.formState === 'newBuild') {
       this.tableData = []
-      this.$set(this.bjd, 'shouliriqi', new Date())
+      const date = this.formatter.dateFormat('YYYY-MM-dd')
-      this.$set(this.bjd, 'baojianriqi', new Date())
+      this.$set(this.bjd, 'shouliriqi', date)
+      this.$set(this.bjd, 'baojianriqi', date)
       this.getSblb()
       if (this.bjd.shebeizhongleidaima === '8000') {
         this.bjd.shiyongdanwei = '/'
@@ -878,9 +810,6 @@ export default {
       this.templateName = '车用气瓶报检导入模板.xlsx'
     }
     // 区划跟科室加载完成后读取关联数据
-    if (this.formState === 'create') {
-      this.getBjdDepartment()
-    }
     this.getJylb()
     this.getArea()
     this.getDepts()
@@ -903,7 +832,7 @@ export default {
       }).then(data => {
         this.bjd = data
         if (this.bjd.dataSource === 1 && this.formState !== 'finish') {
-          this.$set(this.bjd, 'shouliriqi', new Date())
+          this.$set(this.bjd, 'shouliriqi', this.formatter.dateFormat('YYYY-MM-dd'))
         }
         if (this.bjd.baojiandianhua === undefined || this.bjd.baojiandianhua === null) {
           this.bjd.baojiandianhua = this.bjd.shigongdanweiDianhua
@@ -938,8 +867,9 @@ export default {
     },
     // 报检设备设置默认值
     setDefaultValue(obj) {
-      this.$set(this.bjd, 'shouliriqi', new Date())
+      const date = this.formatter.dateFormat('YYYY-MM-dd')
-      this.$set(this.bjd, 'baojianriqi', new Date())
+      this.$set(this.bjd, 'shouliriqi', date)
+      this.$set(this.bjd, 'baojianriqi', date)
       this.bjd.lingqufangshi = '自取'
       this.$set(obj, 'neibuleibie', 'JD')
       if (this.bjd.shebeizhongleidaima === '1000') {
@@ -1037,27 +967,18 @@ export default {
     },
     getDepts() { // 查询科室
       this.api({
-        url: '/department/getDepartmentByCode',
+        url: '/department/all',
         method: 'get',
         params: {
-          code: this.bjd.shebeizhongleidaima
+          shebeizhongleidaima: this.bjd.shebeizhongleidaima,
+          quhuadaima: this.bjd.quhuadaima,
+          jianyanleibie: 'JJ'
         }
       }).then(data => {
         this.depts = data
-      })
+        if (this.formState === 'create') {
-    },
+          this.bjdDepartment = this.depts[0]
-    getBjdDepartment() {
+          this.$set(this.bjd, 'departmentId', this.bjdDepartment.id)
-      this.bjdDepartment.shebeizhonglei = this.bjd.shebeizhongleidaima
-      this.bjdDepartment.jianyanleibie = this.bjd.jianyanleibie
-      this.bjdDepartment.quhumingcheng = this.bjd.quhuadaima
-      this.apibjd({
-        url: '/bjdDepartment/getObj',
-        method: 'get',
-        params: this.bjdDepartment
-      }).then(data => {
-        if (data != null) {
-          this.bjdDepartment = data
-          this.$set(this.bjd, 'departmentId', this.bjdDepartment.departmentId)
         }
       })
     },
@@ -1419,40 +1340,12 @@ export default {
         }
       })
     },
+    /**
+     * 报检单保存
+     *
+     * @param audit 是否审核通过
+     */
     bjdSave(audit) {
-      if (audit) {
-        let message = '请确认是否要审核通过'
-        if (this.bjd.shebeizhongleidaima === '3000' || this.bjd.shebeizhongleidaima === '4000') {
-          message = '请确认资料已审核完毕/检验价格已经核定？？？是否继续？？'
-          if (this.$store.getters.userId !== 10221 && this.$store.getters.userId !== 10003) {
-            // 莱芜科室先收费，此处需要跳过。
-            if (this.bjd.ziliaorenlingren.indexOf(this.$store.getters.userId) === -1) {
-              // 如果资料认领人中缺少当前人员不允许当前人员进行审核操作。
-              this.$message({
-                type: 'warning',
-                message: '审核受限，您不属于当前资料审核人！！！监督检验报检设备需经科室资料审核！请核价后提示企业将资料递交到科室。'
-              })
-              return false
-            }
-          }
-        }
-        this.$confirm(message, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.bjdQurenSave(audit)
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消操作！'
-          })
-        })
-      } else {
-        this.bjdQurenSave(audit)
-      }
-    }, // 报检单保存
-    bjdQurenSave(audit) {
       this.$refs['bjd'].validate(valid => {
         if (valid) {
           if (this.judgeNull(this.bjd.quhuadaima)) {
@@ -1514,7 +1407,8 @@ export default {
             data: {
               bjd: this.bjd,
               paramList: this.tableData,
-              audit: audit
+              audit: audit,
+              isShengju: false
             }
           }).then(data => {
             Utils.$emit('bjd-list')
@@ -1531,7 +1425,7 @@ export default {
                 // 【济南市特种设备检验研究院】您的43项目报检申请资料审核已通过，请根据施工进度登录企业管理平台[申请现场检验]。咨询电话:89738113。
               }
             } else {
-              this.tableData = data.tableData
+              this.tableData = data.renwus
               for (const tableObj of this.tableData) {
                 const sblbpz = []
                 sblbpz.push(tableObj.shebeileibiedaima)