Fixiaobai
2023-09-19 88859106604b03bed968f2f55508e3a5b83f4ce9
	modified:   src/components/view/Processingproducts.vue
modified: src/components/view/Technicalindex.vue
modified: src/components/view/finishedProductInspectionUp.vue
modified: src/components/view/processInspectionUpdate.vue
modified: src/components/view/raw-ins.vue
modified: src/components/view/rawUnqualified/raw.vue
modified: src/components/view/record-content.vue
modified: src/components/view/self-inspection.vue
modified: src/components/view/technical.vue
modified: src/main.js
已修改10个文件
94 ■■■■ 文件已修改
src/components/view/Processingproducts.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/Technicalindex.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/finishedProductInspectionUp.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/processInspectionUpdate.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/raw-ins.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/rawUnqualified/raw.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/record-content.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/self-inspection.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/technical.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/Processingproducts.vue
@@ -15,7 +15,7 @@
          <el-input
            size="small"
            v-model="search.productName"
            style="width: 224px;margin-right: 30px;"
            style="width: 14vw;margin-right: 5px;"
            placeholder="请输入"
            clearable
          ></el-input>
@@ -23,7 +23,7 @@
          <el-input
            size="small"
            v-model="search.specificationModel"
            style="width: 224px;margin-right: 30px;"
            style="width: 14vw;margin-right: 5px;"
            placeholder="请输入"
            clearable
          ></el-input>
@@ -32,7 +32,7 @@
            v-model="search.productCategories"
            size="small"
            placeholder="请选择"
            style="width: 224px;margin-right: 30px;"
            style="width: 14vw;margin-right: 5px;"
          >
            <el-option label="原材料" :value="0"></el-option>
            <el-option label="成品" :value="1"></el-option>
@@ -43,7 +43,7 @@
            v-model="search.state"
            size="small"
            placeholder="请选择"
            style="width: 224px;margin-right: 30px;"
            style="width: 14vw;margin-right: 5px;"
          >
            <el-option label="返修中" :value="1"></el-option>
            <el-option label="待处理" :value="0"></el-option>
src/components/view/Technicalindex.vue
@@ -200,7 +200,7 @@
                            <el-form-item label="类型">
                                <template>
                                    <el-select v-model="form.type" size="small" placeholder="请选择" @change="edittype"
                                        style="width: 554px;margin-right: 30px;">
                                        style="width: 98%;margin-right: 30px;">
                                        <el-option label="橡胶连接器" :value="0"></el-option>
                                        <el-option label="金属连接器" :value="1"></el-option>
                                        <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -223,7 +223,7 @@
                                <el-col :span="11" :offset="2">
                                    <el-form-item label="工艺">
                                        <template>
                                            <el-select v-model="form.name" placeholder="请选择" @change="craftrow" allow-create filterable>
                                            <el-select v-model="form.name" style="width: 95%;" placeholder="请选择" @change="craftrow" allow-create filterable>
                                                <el-option v-for="item in craftapi" :key="item.id" :label="item.name" :value="item.id">
                                                </el-option>
                                            </el-select>
@@ -262,13 +262,13 @@
                                </el-col>
                                <el-col :span="11" :offset="2">
                                    <el-form-item label="项目">
                                        <el-input v-model="form.project" style="width: 200px;" placeholder="请输入项目"></el-input>
                                        <el-input v-model="form.project" style="width: 95%;" placeholder="请输入项目"></el-input>
                                    </el-form-item>
                                </el-col>
                            </el-row>
                            <el-form-item label="单位">
                                <el-input v-model="form.unit" placeholder="请输入单位" style="width: 200px;"></el-input>
                                <el-input v-model="form.unit" placeholder="请输入单位" style="width: 35.95%;"></el-input>
                            </el-form-item>
                        </el-form>
                        <span slot="footer" class="dialog-footer">
src/components/view/finishedProductInspectionUp.vue
@@ -396,7 +396,7 @@
                }
            }).then(res => {
                this.materialOptions = res.data;
                if(this.materialOptions.length===1){
                if(this.materialOptions.length===1&&row.did!=null){
                    this.$message({
                    message: '该项目下只有一个试验设备,无需选择!',
                    type: 'warning'
src/components/view/processInspectionUpdate.vue
@@ -103,7 +103,7 @@
            > -->
                </el-col>
            </el-row>
            <el-table border :data="inspectionItems"  max-height="420" :span-method="handleSpanMethod"
            <el-table border :data="inspectionItems" max-height="420" :span-method="handleSpanMethod"
                height="calc(100vh - 550px)" style="width: 100%">
                <el-table-column type="index" label="序号" width="60"></el-table-column>
                <el-table-column label="项目" prop="father"></el-table-column>
@@ -125,13 +125,14 @@
                    <template slot-scope="scope">
                        <el-col>
                            <el-button v-if="!scope.row.isSelectDevice" type="text" @click="clickTableSelect(scope)">{{
                            scope.row.dname == null ? "请选择" : scope.row.dname
                        }}</el-button>
                        <el-select @blur="blurNode(scope)" v-else-if="scope.row.isSelectDevice" style="width: 100%;" @change="clickNodeSure(scope.row)"
                            v-model="filterText" placeholder="请选择">
                            <el-option v-for="item in materialOptions" :key="item.id" :label="item.device" :value="item.id">
                            </el-option>
                        </el-select>
                                scope.row.dname == null ? "请选择" : scope.row.dname
                            }}</el-button>
                            <el-select @blur="blurNode(scope)" v-else-if="scope.row.isSelectDevice" style="width: 100%;"
                                @change="clickNodeSure(scope.row)" v-model="filterText" placeholder="请选择">
                                <el-option v-for="item in materialOptions" :key="item.id" :label="item.device"
                                    :value="item.id">
                                </el-option>
                            </el-select>
                        </el-col>
                    </template>
                </el-table-column>
@@ -304,7 +305,7 @@
        this.getTableData()
    },
    methods: {
        blurNode(scope){
        blurNode(scope) {
            // console.log(11);
            // this.$set(this.inspectionItems[scope.$index],'isSelectDevice',false)
        },
@@ -378,11 +379,11 @@
                }
            }).then(res => {
                this.materialOptions = res.data;
                if(this.materialOptions.length===1){
                if (this.materialOptions.length === 1&&row.did!=null) {
                    this.$message({
                    message: '该项目下只有一个试验设备,无需选择!',
                    type: 'warning'
                });
                        message: '该项目下只有一个试验设备,无需选择!',
                        type: 'warning'
                    });
                    return
                }
                row.isSelectDevice = true
@@ -397,8 +398,8 @@
        clickTableSelect(scope) {
            // return scope;
            // this.centerDialogVisible = true;
            if(this.clickSelectDevice.index!=null){
                this.$set(this.inspectionItems[this.clickSelectDevice.index],'isSelectDevice',false)
            if (this.clickSelectDevice.index != null) {
                this.$set(this.inspectionItems[this.clickSelectDevice.index], 'isSelectDevice', false)
            }
            this.clickSelectDevice.index = scope.$index;
            this.clickSelectDevice.rpId = scope.row.id;
src/components/view/raw-ins.vue
@@ -99,7 +99,7 @@
        v-model="search.formTime"
        size="small"
        placeholder="请输入"
        style="width: 224px;margin-right: 30px;"
        style="width: 14vw;margin-right: 5px;"
        clearable
        value-format="yyyy-MM-dd"
      ></el-date-picker>
@@ -108,7 +108,7 @@
        v-model="search.code"
        placeholder="请输入"
        size="small"
        style="width: 224px;margin-right: 30px;"
        style="width: 14vw;margin-right: 5px;"
        clearable
      ></el-input>
      <span>检测状态:</span>
@@ -116,7 +116,7 @@
        v-model="search.insState"
        size="small"
        placeholder="请选择"
        style="width: 224px;margin-right: 30px;"
        style="width: 14vw;margin-right: 5px;"
      >
        <el-option label="全部" :value="2"></el-option>
        <el-option label="未检测" :value="0"></el-option>
@@ -127,7 +127,7 @@
        v-model="search.name"
        size="small"
        placeholder="请输入"
        style="width: 224px;margin-right: 30px;"
        style="width: 14vw;margin-right: 5px;"
        clearable
      ></el-input>
      <el-button size="mini" @click="clean()"><span>重 置</span></el-button>
src/components/view/rawUnqualified/raw.vue
@@ -15,7 +15,7 @@
          <el-input
            size="small"
            v-model="search.productName"
            style="width: 224px;margin-right: 30px;"
            style="width: 14vw;margin-right: 5px;"
            placeholder="请输入"
            clearable
          ></el-input>
@@ -24,7 +24,7 @@
            v-model="search.formTime"
            size="small"
            placeholder="请输入"
            style="width: 224px;margin-right: 30px;"
            style="width: 12vw"
            clearable
            value-format="yyyy-MM-dd"
          ></el-date-picker>
@@ -33,7 +33,7 @@
            v-model="search.processingStatus"
            size="small"
            placeholder="请选择"
            style="width: 224px;margin-right: 30px;"
            style="width: 12vw"
          >
            <el-option label="已处理" :value="1"></el-option>
            <el-option label="待处理" :value="0"></el-option>
@@ -42,7 +42,7 @@
          <el-input
            size="small"
            v-model="search.supplier"
            style="width: 224px;margin-right: 20px;"
            style="width: 12vw"
            placeholder="请输入"
          ></el-input>
          <el-button size="mini" @click="clean()"><span>重 置</span></el-button>
src/components/view/record-content.vue
@@ -147,7 +147,7 @@
                <el-form-item label="类型" prop="type">
                    <template>
                        <el-select v-model="form.type"  
                        @change="edittype" placeholder="请选择" style="width: 480px;">
                        @change="edittype" placeholder="请选择" style="width: 100%;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -159,7 +159,7 @@
                    <template>
                        <el-select v-model="form.work"
                        @change="workevent"
                        placeholder="请选择" style="width: 480px;">
                        placeholder="请选择" style="width: 100%;">
                            <el-option
                            v-for="item in process"
                            :key="item.name"
@@ -171,7 +171,7 @@
                </el-form-item>
                <el-form-item label="工艺名称" prop="name">
                    <template>
                        <el-select v-model="form.craft" placeholder="请选择" style="width: 480px;">
                        <el-select v-model="form.craft" placeholder="请选择" style="width: 100%;">
                            <el-option
                            v-for="item in craftapi"
                            :key="item.id"
src/components/view/self-inspection.vue
@@ -216,7 +216,7 @@
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.value" placeholder="请选择" @change="edittype" style="width: 480px;">
                        <el-select v-model="form.value" placeholder="请选择" @change="edittype" style="width: 100%;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>
                            <el-option label="湿插拔电连接器" :value="2"></el-option>
@@ -228,7 +228,7 @@
                    <template>
                        <el-select v-model="form.procedure" 
                        @change="workevent"
                        placeholder="请选择" style="width: 480px;">
                        placeholder="请选择" style="width: 100%;">
                            <el-option
                            v-for="item in process"
                            :key="item.name"
@@ -253,9 +253,9 @@
                        </template>
                </el-form-item>
            </el-col>
                <el-col :span="10" :offset="3">
                <el-col :span="10" :offset="4">
                <el-form-item label="自检项目">
                    <el-input v-model="form.project" style="width: 180px;"></el-input>
                    <el-input v-model="form.project" style="width: 100%;"></el-input>
                </el-form-item>
            </el-col>
            </el-row>
@@ -265,9 +265,9 @@
                    <el-input v-model="form.unit" style="width: 180px;"></el-input>
                </el-form-item>
                </el-col>
                <el-col :span="10" :offset="3">
                <el-col :span="10" :offset="4">
                <el-form-item label="标准值">
                    <el-input v-model="form.standard" style="width: 180px;"></el-input>
                    <el-input v-model="form.standard" style="width: 100%;"></el-input>
                </el-form-item>
                </el-col>
            </el-row>
src/components/view/technical.vue
@@ -18,14 +18,15 @@
            v-model="searchData.date"
            value-format="yyyy-MM-dd"
            type="date"
            style="width: 10vw;"
            placeholder="选择日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="产品名称:">
        <el-form-item label="产品名称:" style="margin-right: 24px;">
          <el-input v-model="searchData.name" ></el-input>
        </el-form-item>
        <el-form-item label="编制状态:" >
          <el-select v-model="searchData.type" size="small" placeholder="全部" style="width: 250px;">
          <el-select v-model="searchData.type" size="small" placeholder="全部" style="width: 10vw;">
              <el-option label="待编制" :value="0"></el-option>
                            <el-option label="已编制" :value="1"></el-option>
          </el-select>
@@ -345,7 +346,7 @@
  font-size: 20px;
}
.search-header .el-form-item:nth-child(1){
  margin-right: 48px;
  margin-right: 24px;
.search-header .el-form-item:nth-child(2){
  margin-right: 24px;
@@ -368,7 +369,7 @@
}
/* 输入框的样式 */
.search-header .el-form-item .el-input >>>.el-input__inner{
width: 224px;
width: 10vw;
height: 32px ;
box-sizing: border-box;
background: rgb(255, 255, 255);
src/main.js
@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);
const javaApi = 'http://192.168.0.23:8001'
const javaApi = 'http://192.168.10.249:8001'
// localhost 127.0.0.1
// const javaApi = 'http://127.0.0.1:8001/'