Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into m...

licp

2024-09-24 0762e093d412ae2f2e7f02a2b9e1774c67de8564

Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-before into master

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

@@ -256,6 +256,13 @@
              </el-select>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6" v-if="addObj.formType==='其他成品'">
            <div class="search_label">零件号：</div>
            <div class="search_input">
              <el-input size="small" :placeholder="active>1 ? '' : '请输入'" clearable v-model="addObj.engineering"
                        :readonly="active>1"></el-input>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6" v-if="addObj.formType!='其他成品'&&addObj.formType">
            <div class="search_label"><span class="required-span">* </span>下发至对象：</div>
            <div class="search_input">
@@ -1559,8 +1566,13 @@
          }
        }else if(this.createState==2){
          this.addObj.production = selects.company
          // 如果选择的单位是没有对应的英文名称就用'/'代替
          if (!selects.companyEn) {
            this.addObj.productionEn = '/'
          } else {
          this.addObj.productionEn = selects.companyEn
        }
        }
        this.selectUserDia = false
      },
      containsValue(str) {

 src/components/view/custom_manage.vue

@@ -71,31 +71,27 @@
                    </el-col>
                </el-row>
                <el-row style="line-height: 50px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                        </span>客户单位EN：</el-col>
                    <el-col :span="7" style="text-align: right;padding-right: 8px;">客户单位EN：</el-col>
                    <el-col :span="15">
                        <el-input v-model="user.companyEn" size="small" clearable></el-input>
                    </el-col>
                </el-row>
                <el-row style="margin-top: 15px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                        </span>单位地址：</el-col>
                    <el-col :span="7" style="text-align: right;padding-right: 8px;">单位地址：</el-col>
                    <el-col :span="15">
                        <el-input type="textarea" v-model="user.address" size="small" clearable
                            :autosize="{minRows: 2, maxRows: 4}"></el-input>
                    </el-col>
                </el-row>
                <el-row style="margin-top: 15px;">
                    <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                        </span>客户地址EN：</el-col>
                    <el-col :span="7" style="text-align: right;padding-right: 8px;">客户地址EN：</el-col>
                    <el-col :span="15">
                        <el-input type="textarea" v-model="user.addressEn" size="small" clearable
                            :autosize="{minRows: 2, maxRows: 4}"></el-input>
                    </el-col>
                </el-row>
        <el-row style="line-height: 50px;">
            <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                </span>加急额度：</el-col>
            <el-col :span="7" style="text-align: right;padding-right: 8px;">加急额度：</el-col>
            <el-col :span="15">
                <el-input v-model="user.num" size="small" clearable></el-input>
            </el-col>
@@ -113,8 +109,7 @@
            </el-col>
        </el-row>
        <el-row style="line-height: 50px;">
            <el-col :span="7" style="text-align: right;padding-right: 8px;"><span class="required-span">*
                </span>客户编号：</el-col>
            <el-col :span="7" style="text-align: right;padding-right: 8px;">客户编号：</el-col>
            <el-col :span="15">
                <el-input v-model="user.code2" size="small" clearable></el-input>
            </el-col>
@@ -265,29 +260,29 @@
            },
            customAdd() {
                if (this.user.company == '' || this.user.company == null) {
                    this.$message.error('请填写客户单位')
                    this.$message.error('请填写客户名称')
                    return
                }
                if (this.user.address == '' || this.user.address == null) {
                    this.$message.error('请填写单位地址')
                    return
                }
                if (this.user.companyEn == '' || this.user.companyEn == null) {
                    this.$message.error('请填写英文客户单位')
                    return
                }
                if (this.user.addressEn == '' || this.user.addressEn == null) {
                    this.$message.error('请填写英文单位地址')
                    return
                }
        if (this.user.code2 == '' || this.user.code2 == null) {
            this.$message.error('请填写客户编号')
            return
        }
        if (this.user.code2 == '' || this.user.code2 == null) {
            this.$message.error('请填写加急额度')
            return
        }
                // if (this.user.address == '' || this.user.address == null) {
                //     this.$message.error('请填写单位地址')
                //     return
                // }
                // if (this.user.companyEn == '' || this.user.companyEn == null) {
                //     this.$message.error('请填写英文客户单位')
                //     return
                // }
                // if (this.user.addressEn == '' || this.user.addressEn == null) {
                //     this.$message.error('请填写英文单位地址')
                //     return
                // }
        // if (this.user.code2 == '' || this.user.code2 == null) {
        //     this.$message.error('请填写客户编号')
        //     return
        // }
        // if (this.user.code2 == '' || this.user.code2 == null) {
        //     this.$message.error('请填写加急额度')
        //     return
        // }
                this.loading = true
                this.$axios.post(this.$api.user.addCustom, this.user, {
                    headers: {