licp
2024-08-22 df33895b6a072ce2963dc8b0688ebfd0989eef2c
变更检验下单
已修改6个文件
已添加1个文件
51 ■■■■■ 文件已修改
src/assets/api/controller.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/Inspection.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspection-order.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/view/enter.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/img/特高压.jpg 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/api/controller.js
@@ -166,7 +166,7 @@
  selectOrderManDay: "/insOrder/selectOrderManDay", //查询订单总共预计时间
  upInsOrder: "/insOrder/upInsOrder", //检验下发
  getInsOrder: "/insOrder/getInsOrder", //查询检验下单内容详情
  upInsOrderOfState: "/insOrder/upInsOrderOfState", //审核检验单机进行状态修改
  upInsOrderOfState: "/insOrder/upInsOrderOfState2", //审核检验单机进行状态修改
  addInsOrderTemplate: "/insOrder/addInsOrderTemplate", //添加检验单模板
  selectInsOrderTemplate: "/insOrder/selectInsOrderTemplate", //查询检验单模板
  selectInsOrderTemplateById: "/insOrder/selectInsOrderTemplateById", //通过检验单模板id获取检验单模板内容
src/components/do/b1-ins-order/add.vue
@@ -2065,7 +2065,10 @@
              this.distributeData.appointed = ress.data
            })
            setTimeout(() => {
              this.issuedDialogVisible = true;
              // this.issuedDialogVisible = true;
              // this.$message.success('提交成功')
              this.upLoad = false
              this.$parent.playOrder(0)
            }, 1000)
          })
        } else {
src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -3337,7 +3337,7 @@
        }
      },
      handleSubmit(){
        if(this.insOrder.departmentLims=='检测中心'&&this.insOrder.orderType=='C'){
        if(this.insOrder.orderType=='C'){
          this.verifyUser = this.insOrder.prepareUserId
          this.submit()
        }else{
@@ -3370,8 +3370,9 @@
                laboratory: this.sonLaboratory,
                verifyUser: this.verifyUser,
                entrustCode: this.insOrder.entrustCode
              }).then(res => {
              }).then(async res => {
                if (res.code === 200) {
                  await this.handleCType()
                  this.$message.success("操作成功")
                  this.$emit('goback')
                }
@@ -3402,8 +3403,9 @@
                  orderId: this.orderId,
                  laboratory: this.sonLaboratory,
                  verifyUser: this.verifyUser
                }).then(res => {
                }).then( async res => {
                  if (res.code === 200) {
                    await this.handleCType()
                    this.$message.success("操作成功")
                    this.$emit('goback')
                  }
@@ -3421,6 +3423,20 @@
        })
        return
      },
      async handleCType(){
        if(this.insOrder.departmentLims=='质量部'){
          await this.$axios.post(this.$api.insOrderPlan.verifyPlan, {
            orderId: this.orderId,
            type: 1,
            laboratory: this.sonLaboratory,
            tell: null
          }).then(res => {
            if (res.code === 200) {
            }
          }).catch(error => {
          })
        }
      },
      // ç»Ÿä¸€åœ¨è¿™é‡Œä¿å­˜æ•°æ®
      saveInsContext() {
        try {
src/components/view/b1-inspection-order.vue
@@ -282,7 +282,7 @@
            </el-dialog>
            <!-- ä¸‹å‘ -->
            <el-dialog title="检验分配" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose">
                <div class="body" style="max-height: 60vh;">
                <div class="body" style="max-height: 60vh;" v-if="issuedDialogVisible">
                    <el-row>
                        <el-col class="search_thing" style="width: 95%;">
                            <div class="search_label"><span class="required-span">* </span>约定时间:</div>
@@ -293,7 +293,7 @@
                            </div>
                        </el-col>
                        <el-col class="search_thing" style="width: 95%;">
                            <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>指派人员:</div>
                            <div class="search_label">指派人员:</div>
                            <div class="search_input">
                                <el-select v-model="distributeData.userId" placeholder="请选择" size="small" style="width: 100%;" clearable filterable @change="changeUser">
                                    <el-option v-for="(item,i) in personList" :key="i+'gbnm.'" :label="item.label" :value="item.value">
@@ -301,7 +301,7 @@
                                </el-select>
                            </div>
                        </el-col>
            <el-col class="search_thing" style="width: 95%;" v-if="distributeData.userId">
            <el-col class="search_thing" style="width: 95%;">
                            <div class="search_label"><span class="required-span" >* </span>试验室:</div>
                            <div class="search_input">
                                <el-select v-model="distributeData.sonLaboratory" placeholder="请选择" size="small" style="width: 100%;" clearable filterable>
@@ -554,7 +554,8 @@
                        type: 'text',
                        method: 'handleIssued',
                        disabFun: (row, index) => {
                            return row.state != 1 || !!row.assign
                            // return row.state != 1 || !!row.assign
              return row.appointed || row.state != 1
                        }
                    }],
                    linkEvent: {
@@ -888,7 +889,7 @@
          if (power[i].menuMethod == 'updateStatus') {
              revoke = true
          }
          if (power[i].menuMethod == 'upInsOrderOfState') {
          if (power[i].menuMethod == 'upInsOrderOfState2') {
              check = true
          }
          if (power[i].menuMethod == 'checkUpdate') {
@@ -1057,12 +1058,7 @@
                    this.$message.error('约定时间未填写')
                    return
                }
        //
        if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){
                    this.$message.error('指派人员未填写')
                    return
                }
        if(this.distributeData.userId&&(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory=='')){
        if(this.distributeData.sonLaboratory==null||this.distributeData.sonLaboratory==''){
                    this.$message.error('试验室未填写')
                    return
                }
src/main.js
@@ -20,7 +20,7 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://192.168.0.104:8001';
const javaApi = 'http://192.168.255.249:8001';
//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
// const javaApi = 'http://114.132.189.42:1234';
src/view/enter.vue
@@ -97,7 +97,7 @@
<template>
  <div class="enter">
    <div class="left">
      <img src="../../static/img/特高压.png">
      <img src="../../static/img/特高压.jpg">
    </div>
    <div class="right">
      <div style="width: calc(100% - 100px * 2);">
static/img/ÌØ¸ßѹ.jpg