合并冲突

licp

2024-05-27 e59a71579f6afd21c76f9d45c3b3f09c28d03c41

合并冲突

 src/assets/api/controller.js

@@ -153,6 +153,8 @@
  selectSampleAndProductByOrderId: "/insOrder/selectSampleAndProductByOrderId", //通过检验单查询检验数据（数据查看）
  costStatistics: "/insOrder/costStatistics", //费用统计
  selectSampleDefects: "/insOrder/selectSampleDefects", //样品缺陷指标
  updateStatus:"/insOrder/updateStatus",//将待审核更新成撤销状态
  updateInspected:"/insOrder/updateInspected",//将待检验的的撤销进行更改
}

const sampleOrder = {

 src/components/view/a6-personnel-detail.vue

@@ -160,7 +160,7 @@
            <span class="required-span">* </span>架构名称：
          </el-col>
          <el-col :span="16" :offset="1">
            <el-input v-model="addOb.name" placeholder="请输入架构名称" clearable size="small"></el-input>
            <el-input v-model="addOb.name" placeholder="请输入架构名称" clearable size="small" @keyup.enter.native="addStandardTree"></el-input>
          </el-col>
        </el-row>
      </div>
@@ -279,6 +279,7 @@
            selectField: {},
          upUserDepardLimsIdPower: true
        },
        currentCompaniesList: []
      }
    },
    mounted() {
@@ -312,11 +313,12 @@
        }
        this.selectTree = data2.replace(' - ', '')
        this.addOb.fatherId = val.id;
        this.componentData.entity.departLimsId = val.id;
        this.componentData.entity.departLimsId = val.id+',';
        this.refreshTable()
      },
      getNodeParent(val) {
        if (val.parent != null) {
          this.currentCompaniesList[val.level-1] = val.data.id
          this.selectTree += ' - ' + val.label
          this.getNodeParent(val.parent)
        }
@@ -431,10 +433,14 @@
        selects.forEach(a=>{
          ids.push(a.id)
        })
        let str = ''
        this.currentCompaniesList.forEach(a=>{
          str+=(a+',')
        })
          this.selectUserDia = false
        this.$axios.post(this.$api.user.upUserDepardLimsId,{
          ids: JSON.stringify(ids),
          id: this.componentData.entity.departLimsId
          id: str
        }).then(res=>{
          if (res.code === 201) {
            return

 src/components/view/b1-inspection-order.vue

@@ -171,7 +171,7 @@
            <!-- 撤销 -->
            <el-dialog title="下单撤销" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose">
                <p style="font-size:16px;color:#333333" v-if="!isQuash">委托编号<span
                        style="color:#34BD66">ZTMS2023071001</span>的信息是否撤销</p>
                        style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>的信息是否撤销</p>
                <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else>
                    <el-form-item label="请输入撤销原因：">
                        <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input>
@@ -226,8 +226,7 @@
            </el-dialog>
        </div>
        <div style="width: 100%;height: 100%;" v-if="active >0">
            <Add :active="active" :currentId="currentId" v-if="active<4" />
      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
            <Add :active="active" :currentId="currentId" />
        </div>
    </div>
</template>
@@ -235,12 +234,10 @@
<script>
    import ValueTable from '../tool/value-table.vue'
    import Add from '../do/b1-ins-order/add.vue'
  import fiberOpticConfig from '../do/b1-ins-order/fiberoptic-config.vue'
    export default {
        components: {
            ValueTable,
            Add,
      fiberOpticConfig
            Add
        },
        data() {
            return {
@@ -456,7 +453,8 @@
                tabIndex: 0,
                active: 0, //1：下单，2：查看，3：审核，4：光纤配置,默认为0
                currentId: null,
        more:false
        more:false,
        insOrderRow:{}
            }
        },
        mounted() {
@@ -557,6 +555,7 @@
            // 撤销
            handlEquash(row) {
                this.quashDialogVisible = true;
        this.insOrderRow=row
            },
            // 下发
            handleIssued(row) {
@@ -601,6 +600,25 @@
            },
            submitForm() {
                this.upLoad = true;
        if (this.tabIndex==1){
          this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{
            if (res.code===200){
              this.upLoad=false
              this.quashDialogVisible=false
              this.refreshTable()
              this.$message.success("更新成功")
            }
          })
        }else{
          this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{
            if (res.code===200){
              this.upLoad = false
              this.quashDialogVisible = false
              this.refreshTable()
              this.$message.success("更新成功")
            }
          })
        }
                let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : ''
                delete this.formData.createTime
                delete this.formData.updateTime

 src/components/view/person-manage.vue

@@ -524,7 +524,7 @@
        }
        this.selectTree = data2.replace(' - ', '')
        this.addOb.fatherId = val.id;
        this.componentData.entity.departId = val.id;
        this.componentData.entity.departId = val.id + ',';
        this.refreshTable()
      },
      nodeOpen(data, node, el) {
@@ -600,7 +600,7 @@
        })
      },
      nodeClick2(ob, node, el) {
        this.currentCompaniesList[node.level-1] = ob.id
        this.getNodeParent(node)
        if (ob.id !== 'SC21') {
          this.personLoad = true
          this.$axios.post(this.$api.companies.selectSimpleList, {
@@ -613,6 +613,12 @@
          })
        }
      },
      getNodeParent(val){
        this.currentCompaniesList[val.level-1] = val.data.id
        if(val.parent!=null){
          this.getNodeParent(val.parent)
        }
      },
      handleSelectionChange(val) {
        this.multipleSelection = val;
      },
@@ -623,24 +629,17 @@
        if(this.currentCompaniesList.length === 0){
          return this.$message.error('请选择组织')
        }
        for (let index = this.currentCompaniesList.length-1; index >1; index--) {
        /* for (let index = this.currentCompaniesList.length-1; index >1; index--) {
          let obj = this.multipleSelection.find(a=>a.companyId==this.currentCompaniesList[index])
          if(!obj){
            this.currentCompaniesList.splice(index,1)
          }else{
            return
          }
        }
        } */
        let arr = []
        this.currentCompaniesList.forEach(b=>{
          /* this.companiesList.forEach(a=>{
            if(a.companyId===b){
              console.log(a)
            }
          }) */
          let obj = this.companiesList.find(a=>a.companyId==b)
          arr.push(obj)
          })
        })
        this.addLoad = true
        this.$axios.post(this.$api.companies.addPersonUser, {
          company: arr,
@@ -661,7 +660,7 @@
          this.addLoad = false
          this.personList = []
          this.userSearch2 = ''
          this.refresh()
          this.selectTreeList()
        }).catch(e => {
          this.addthirdParty = false
          this.addLoad = false

 src/view/notice.vue

@@ -4,7 +4,7 @@
  title="消息通知"
  :visible.sync="drawer"
  :direction="direction"
  :before-close="handleClose" style="height: 100vh;z-index: 9999999;">
  :before-close="handleClose" style="height: 100vh;z-index: 9999999;" size="450px">
    <div class="head">
      <div class="head-search">
        <label>消息类型：</label>