Merge remote-tracking branch 'origin/master'

value

2024-05-27 ec4a8eb416562951f84041a6cd8dd91fcb729e22

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

@@ -80,51 +80,73 @@
               </el-col>
            </el-row>
         </div>
         <div class="search">
            <div class="search_thing">
               <div class="search_label">委托编号：</div>
               <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                     v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
               <div class="search_label">样品名称：</div>
               <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                     v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
        <div class="search_thing">
           <div class="search_label">样品型号：</div>
           <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                 v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
        </div>
        <div class="search_thing">
               <div class="search_label">样品编号：</div>
               <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                     v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
        <div class="search_thing">
               <div class="search_label">下单时间：</div>
               <div class="search_input">
            <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
            type="date"
            size="small"
            format="yyyy-MM-dd"
            value-format="yyyy-MM-dd HH:mm:ss"
            clearable
            placeholder="选择日期">
            </el-date-picker>
          </div>
            </div>
            <div class="search_thing" style="padding-left: 30px;">
               <el-button size="small" @click="refresh()">重 置</el-button>
               <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
            </div>
         <div class="search" :style="`height: ${more?130:80}px;`">
        <el-row :gutter="10">
          <el-col :span="20" style="display: flex;align-items: center;flex-wrap: wrap;">
            <div class="search_thing">
              <div class="search_label">委托编号：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
              <div class="search_label">样品名称：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
              <div class="search_label">样品型号：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
              <div class="search_label">样品编号：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing">
              <div class="search_label">下单时间：</div>
              <div class="search_input">
                <el-date-picker style="width:100%" v-model="componentData.entity.createTime"
                type="date"
                size="small"
                format="yyyy-MM-dd"
                value-format="yyyy-MM-dd HH:mm:ss"
                clearable
                placeholder="选择日期">
                </el-date-picker>
              </div>
            </div>
            <div class="search_thing" v-show="more">
              <div class="search_label">下单人：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" v-show="more">
              <div class="search_label">工程名称：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.value2" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" v-show="more">
              <div class="search_label">生产单位：</div>
              <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                  v-model="componentData.entity.value3" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
          </el-col>
          <el-col :span="4">
            <div class="search_thing" style="padding-left: 10px;">
              <el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'更多':'收起'}}</el-button>
              <el-button size="small" @click="refresh()">重 置</el-button>
              <el-button size="small" type="primary" @click="refreshTable()">查 询</el-button>
            </div>
          </el-col>
        </el-row>
         </div>
         <div class="table">
            <ul class="tab">
               <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li>
            </ul>
            <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
               :key="'b'+upIndex" style="height: calc(100% - 44px)" />
            <ValueTable :style="'height: calc(100% - '+(more?'94':'44')+'px)'" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
               :key="'b'+upIndex"  />
         </div>
         <!-- 审核 -->
         <el-dialog title="下单审核" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose">
@@ -149,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>
@@ -249,6 +271,9 @@
            sampleModel: null,
            sampleCode: null,
                  state: 0,
            value1:null,
            value2:null,
            value3:null,
                  orderBy: {
                     field: 'id',
                     order: 'asc'
@@ -430,7 +455,9 @@
            ],
            tabIndex: 0,
            active: 0, //1：下单，2：查看，3：审核，4：光纤配置,默认为0
            currentId: null
            currentId: null,
        more:false,
        insOrderRow:{}
         }
      },
      mounted() {
@@ -531,6 +558,7 @@
         // 撤销
         handlEquash(row) {
            this.quashDialogVisible = true;
        this.insOrderRow=row
         },
         // 下发
         handleIssued(row) {
@@ -575,6 +603,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