对接下单新增字段

licp

2024-05-27 9ed716080ceb42c2694626e077b58a0aaa7b4f72

对接下单新增字段

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

@@ -107,7 +107,6 @@
          <el-button size="medium" @click="templateDia=true" v-show="active==1">
            <span style="color: #3A7BFA;">保存模板</span>
          </el-button>
          <el-button size="medium" type="primary" @click="$parent.playOrder(4)">光纤配置</el-button>
          <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">提交</el-button>
          <!-- 审核 -->
          <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -246,27 +245,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 +587,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 +754,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>
@@ -125,12 +126,12 @@
            <div class="search_thing" style="width: 20%;" v-if="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>
                  v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
            <div class="search_thing" style="width: 20%;" v-if="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>
                  v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div>
            </div>
          </el-col>
          <el-col :span="4">
@@ -273,8 +274,8 @@
            sampleCode: null,
                        state: 0,
            value1:null,
            value2:null,
            value3:null,
            engineering:null,
            production:null,
                        orderBy: {
                            field: 'id',
                            order: 'asc'

 src/main.js

@@ -17,8 +17,8 @@
// const javaApi = 'http://10.20.102.168:8001';//张
// const javaApi = 'http://172.20.10.3:8001';//姜
// const javaApi = 'http://192.168.11.2:8001';//柴
 const javaApi = 'http://127.0.0.1:8001';//晏
// const javaApi = 'http://114.132.189.42:1234';//测试服
//  const javaApi = 'http://127.0.0.1:8001';//晏
const javaApi = 'http://114.132.189.42:1234';//测试服
//胜云服务器
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';