licp
2024-05-27 cea2593108302edac2796edc530efaed1a010744
检验下单新增字段
已修改2个文件
68 ■■■■ 文件已修改
src/components/do/b1-ins-order/add.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspection-order.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue
@@ -245,6 +245,30 @@
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">工程名称:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value1" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">工厂名称EN:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value2" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">生产单位:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value3" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">生产单位EN:</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value4" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
          <div class="search_label">备注:</div>
          <div class="search_input">
@@ -563,7 +587,11 @@
          isLeave: 0,
          orderType: null,
          send: 1,
          formType: '送检'
          formType: '送检',
          value1: null,
          value2: null,
          value3: null,
          value4: null,
        },
        sample: {
          sampleCode: null,
src/components/view/b1-inspection-order.vue
@@ -80,7 +80,9 @@
                    </el-col>
                </el-row>
            </div>
            <div class="search">
            <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
@@ -114,17 +116,37 @@
            </el-date-picker>
          </div>
                </div>
                <div class="search_thing" style="padding-left: 30px;">
            <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">
@@ -249,6 +271,9 @@
            sampleModel: null,
            sampleCode: null,
                        state: 0,
            value1:null,
            value2:null,
            value3:null,
                        orderBy: {
                            field: 'id',
                            order: 'asc'
@@ -429,8 +454,9 @@
                    },
                ],
                tabIndex: 0,
                active: 4, //1:下单,2:查看,3:审核,4:光纤配置,默认为0
                currentId: null
                active: 0, //1:下单,2:查看,3:审核,4:光纤配置,默认为0
                currentId: null,
        more:false
            }
        },
        mounted() {