Merge remote-tracking branch 'origin/master'

value

2024-05-27 9e34e3c4a5fce250614ac014ecc3e83f41d6f637

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/do/b1-ins-order/add.vue

 src/components/do/b1-ins-order/add.vue

@@ -246,27 +246,27 @@
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">工程名称：</div>
          <div class="search_label"><span class="required-span">* </span>工程名称：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value1" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineering" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">工程名称EN：</div>
          <div class="search_label"><span class="required-span">* </span>工程名称EN：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value2" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.engineeringEn" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">生产单位：</div>
          <div class="search_label"><span class="required-span">* </span>生产单位：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value3" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.production" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6">
          <div class="search_label">生产单位EN：</div>
          <div class="search_label"><span class="required-span">* </span>生产单位EN：</div>
          <div class="search_input">
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.value4" :readonly="active>1"></el-input>
            <el-input size="small" placeholder="请输入" clearable v-model="addObj.productionEn" :readonly="active>1"></el-input>
          </div>
        </el-col>
        <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -588,10 +588,10 @@
          orderType: null,
          send: 1,
          formType: '送检',
          value1: null,
          value2: null,
          value3: null,
          value4: null,
          engineering: null,
          engineeringEn: null,
          production: null,
          productionEn: null,
        },
        sample: {
          sampleCode: null,
@@ -755,6 +755,14 @@
          this.$message.error('请输入来样方式')
        } else if (!this.addObj.orderType) {
          this.$message.error('请选择检验类别')
        }else if (!this.addObj.engineering) {
          this.$message.error('请输入工程名称')
        } else if (!this.addObj.engineeringEn) {
          this.$message.error('请输入工程名称EN')
        }else if (!this.addObj.production) {
          this.$message.error('请输入生产单位')
        }else if (!this.addObj.productionEn) {
          this.$message.error('请输入生产单位EN')
        } else if (this.sampleList.length < 1) {
          this.$message.error('请添加一个样品')
        } else if (!this.sampleList.every(m => m.sample)) {

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

@@ -77,6 +77,7 @@
                <el-row class="title">
                    <el-col :span="12" style="padding-left: 20px;">检验下单</el-col>
                    <el-col :span="12" style="text-align: right;">
            <el-button size="medium" type="primary" @click="playOrder(4)">光纤配置</el-button>
                        <el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">下单</el-button>
                    </el-col>
                </el-row>
@@ -227,7 +228,7 @@
            </el-dialog>
        </div>
        <div style="width: 100%;height: 100%;" v-if="active >0">
            <Add :active="active" :currentId="currentId" v-if="active<4" />
            <Add :active="active" :currentId="currentId" v-show="active<4" />
      <fiberOpticConfig :currentId="currentId" v-if="active==4" />
        </div>
    </div>

 src/components/view/custom_manage.vue

@@ -232,7 +232,6 @@
                upIndex: 0,
                addDia: false,
                addPower: true,
                addDia: false,
                user: {
                    name: null
                },