value
2023-08-25 b92d17185f0c68317cd3563c7468132c7f46658a
修改委托
已修改2个文件
137 ■■■■■ 文件已修改
src/layout/components/Navbar.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/inspectionManagement/commissionInspection/addCommision.vue 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Navbar.vue
@@ -65,7 +65,11 @@
        confirmPwd: ''
      },
      dialogFormVisible: false,
      formLabelWidth: '120px'
      formLabelWidth: '120px',
            user: {
                id: null,
                name: 'value'
            }
    }
  },
  components: {
@@ -78,14 +82,6 @@
      'avatar'
    ])
  },
    data() {
        return {
            user: {
                id: null,
                name: 'value'
            }
        }
    },
    mounted() {
        this.getUser()
    },
src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -19,7 +19,7 @@
                    </div>
                    <el-table ref="detectionInfo" :max-height="800" :cell-style="{textAlign: 'center'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}"
                        :data="detectionInfo" style="width: 100%">
                        :data="detectionInfo" style="width: 100%;margin-bottom: 20px;">
                        <el-table-column type="index" label="序号" min-width="10%" />
                        <el-table-column prop="sampleNumber" label="样品编号" min-width="8%" />
                        <el-table-column prop="sampleName" label="样品名称" min-width="10%" />
@@ -29,15 +29,14 @@
                        <el-table-column prop="addway" label="添加方式" min-width="8%">
                            <template slot-scope="scope">
                                <div v-if="scope.row.addway === 0">
                                    <el-tag :type='success' disable-transitions>扫描</el-tag>
                                    <el-tag type="success" disable-transitions>扫描</el-tag>
                                </div>
                                <div v-if="scope.row.addway === 1">
                                    <el-tag :type='primary' disable-transitions>录入</el-tag>
                                    <el-tag type="primary" disable-transitions>录入</el-tag>
                                </div>
                                <div v-else></div>
                            </template>
                        </el-table-column>
                        <el-table-column prop="experiment" label="试验" min-width="8%" />
                        <el-table-column prop="remarks" label="备注" min-width="8%" />
                        <el-table-column label="操作" min-width="8%">
                            <template slot-scope="scope">
@@ -49,10 +48,8 @@
                </div>
                <div class="secondBox">
                    <el-row class="header">
                        <el-col :span="12">基本信息</el-col>
                        <el-col :span="12" style="font-size: 16px;margin-bottom: 5px;">基本信息</el-col>
                        <el-col :span="12" style="text-align: right;">
                            <!-- 点击返回,当前页面值为false -->
                            <!-- <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">打印委托单</el-button> -->
                        </el-col>
                    </el-row>
                    <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px"
@@ -61,48 +58,49 @@
                            <el-row :gutter="200">
                                <el-col :span="5">
                                    <el-form-item label="委托编号:">
                                        <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled
                                            autocomplete="off" />
                                        <el-input style="width: 200px" type="text" :value="infoForm.commisioncode" readonly disabled
                                            autocomplete="off" size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="委托单位:">
                                        <el-input style="width: 160px" v-model="infoForm.department" placeholder="请输入委托单位" />
                                        <el-input style="width: 200px" v-model="infoForm.department" placeholder="请输入委托单位" size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="联系人:">
                                        <el-input style="width: 160px" v-model="infoForm.contacter" placeholder="请输入委托单位" />
                                        <el-input style="width: 200px" v-model="infoForm.contacter" placeholder="请输入委托单位" size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="联系电话:">
                                        <el-input style="width: 160px" v-model="infoForm.tel" placeholder="请输入联系电话" />
                                        <el-input style="width: 200px" v-model="infoForm.tel" placeholder="请输入联系电话" size="small" />
                                    </el-form-item>
                                </el-col>
                            </el-row>
                            <el-row :gutter="200">
                                <el-col :span="5">
                                    <el-form-item label="联系地址:">
                                        <el-input style="width: 160px;" v-model="infoForm.address" placeholder="请输入联系地址"
                                            autocomplete="off" />
                                        <el-input style="width: 200px;" v-model="infoForm.address" placeholder="请输入联系地址" autocomplete="off"
                                            size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="完成期限:">
                                        <el-date-picker v-model="infoForm.deadline" type="date" placeholder="选择日期" style="width: 160px;">
                                        <el-date-picker v-model="infoForm.deadline" type="date" placeholder="选择日期" style="width: 200px;"
                                            size="small">
                                        </el-date-picker>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="送样时间:">
                                        <el-date-picker v-model="infoForm.time" type="date" placeholder="选择日期" style="width: 160px;">
                                        <el-date-picker v-model="infoForm.time" type="date" placeholder="选择日期" style="width: 200px;">
                                        </el-date-picker>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="送样方式:">
                                        <el-select style="width: 160px;" v-model="infoForm.way" size="small" placeholder="送样">
                                        <el-select style="width: 200px;" v-model="infoForm.way" size="small" placeholder="送样">
                                            <el-option v-for="options in sampleDeliveryMode" :key="options.key"
                                                :value="options.value">{{ options.value }}</el-option>
                                        </el-select>
@@ -112,23 +110,26 @@
                            <el-row :gutter="200">
                                <el-col :span="5">
                                    <el-form-item label="送样人:">
                                        <el-input style="width: 160px;" v-model="infoForm.sender" placeholder="请输入送样人" autocomplete="off" />
                                        <el-input style="width: 200px;" v-model="infoForm.sender" placeholder="请输入送样人" autocomplete="off"
                                            size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="送样人电话:">
                                        <el-input style="width: 160px;" v-model="infoForm.sendertel" placeholder="请输入送样人电话"
                                            autocomplete="off" />
                                        <el-input style="width: 200px;" v-model="infoForm.sendertel" placeholder="请输入送样人电话"
                                            autocomplete="off" size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="报告数:">
                                        <el-input style="width: 160px;" v-model="infoForm.num" placeholder="请输入报告数" autocomplete="off" />
                                        <el-input style="width: 200px;" v-model="infoForm.num" placeholder="请输入报告数" autocomplete="off"
                                            size="small" />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="5">
                                    <el-form-item label="委托备注:">
                                        <el-input style="width: 160px;" v-model="infoForm.other" placeholder="备注" autocomplete="off" />
                                        <el-input style="width: 200px;" v-model="infoForm.other" placeholder="备注" autocomplete="off"
                                            size="small" />
                                    </el-form-item>
                                </el-col>
                            </el-row>
@@ -143,60 +144,55 @@
                </div>
            </div>
            <div class="checkType">
                <el-dialog title="添加指标" :visible.sync="dialogueFormVisible" width="40%">
                <el-dialog title="添加样品" :visible.sync="dialogueFormVisible" width="40%" top="30vh">
                    <el-form :model="addPointerForm" ref="addPointerForm" class="addPointerForm" label-position="right"
                        label-width="100px" size="mini">
                        <el-row :gutter="50">
                            <el-col :span="10">
                            <el-col :span="11">
                                <el-form-item label="样品编号:">
                                    <el-input style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small" disabled>
                                    <el-input v-model="addPointerForm.sampleNumber" size="small" disabled>
                                    </el-input>
                                </el-form-item>
                            </el-col>
                            <el-col :span="10">
                            <el-col :span="11">
                                <el-form-item label="样品名称:">
                                    <el-select style="width: 160px;" v-model="addPointerForm.sampleName" size="small"
                                        placeholder="请选择样品名称" @change="upMaterialName">
                                        <el-option v-for="options in sampleoptions" :value="options.key"
                                            :label="options.value"></el-option>
                                    <el-select v-model="addPointerForm.sampleName" size="small" placeholder="请选择样品名称"
                                        @change="upMaterialName">
                                        <el-option v-for="options in sampleoptions" :value="options.key" :label="options.value"></el-option>
                                    </el-select>
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row :gutter="50">
                            <el-col :span="10">
                            <el-col :span="11">
                                <el-form-item label="规格型号:">
                                    <el-select style="width: 160px;" v-model="addPointerForm.specificationsModels" size="small"
                                        placeholder="请先选择样品名称">
                                    <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="请先选择样品名称">
                                        <el-option v-for="options in model_spe_options" :value="options.value"
                                            :key="options.key">{{ options.value }}</el-option>
                                    </el-select>
                                </el-form-item>
                            </el-col>
                            <el-col :span="10">
                            <el-col :span="11">
                                <el-form-item label="样品单位:">
                                    <el-input style="width: 160px" type="text" v-model="addPointerForm.unit" placeholder="请输入单位"
                                        autocomplete="off" />
                                    <el-input type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row :gutter="50">
                            <el-col :span="10">
                            <el-col :span="11">
                                <el-form-item label="样品数量:">
                                    <el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量"
                                        autocomplete="off" />
                                    <el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量" autocomplete="off" />
                                </el-form-item>
                            </el-col>
                            <el-col :span="10">
                            <el-col :span="11">
                                <el-form-item label="备注:">
                                    <el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="请输入备注"
                                        autocomplete="off" />
                                    <el-input type="text" v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" />
                                </el-form-item>
                            </el-col>
                        </el-row>
                        <el-row :gutter="50">
                            <el-col :span="10">
                                <el-form-item label="添加实验:">
                                <el-form-item label="添加项目:">
                                    <el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
                                        <el-checkbox v-for="expers in experList" :label="expers.label"
                                            :key="expers.key">{{ expers.label }}</el-checkbox>
@@ -292,7 +288,7 @@
        },
        created() {
            this.viewId = this.$route.params.viewId
            this.$store.commit('settings/SAVE_LINK',this.viewId)
            this.$store.commit('settings/SAVE_LINK', this.viewId)
            this.getlink(this.$route.params.viewId)
        },
        mounted() {
@@ -319,7 +315,8 @@
                this.sampleoptions = res.data.map((item) => {
                    return {
                        key: item.id.toString(),
                        value: item.name
                        value: item.name,
                        code: item.code
                    }
                })
            },
@@ -377,31 +374,6 @@
                    sampleDeliveryPhone: this.infoForm.sendertel,
                    sampleSender: this.infoForm.sender
                })
                //       const res = await addInspection({
                //   completionDeadline: "2023-08-03",
                //   contactAddress: "江苏南通",
                //   contactNumber: "12321423432",
                //   contacts: "小黑",
                //   entrustRemarks: "委托备注YPBH123456789YPBH123456789YPBH123456789",
                //   entrusted: "阿里巴巴",
                //   inspectionTime: "2023-08-03",
                //   linkDetectionList: [
                //     {
                //       "experiment": "做梦",
                //       "remarks": "通过了",
                //       "sampleName": "发动机",
                //       "sampleNumber": "YPBH123456789",
                //       "samplesNumber": 20,
                //       "specificationsModels": "GGXH-AAAAA",
                //       "unit": "百度"
                //     }
                //   ],
                //   reportNumber: 23,
                //   sampleDeliveryMode: 1,
                //   sampleDeliveryPhone: "123456789676",
                //   sampleSender: "小白"
                // })
                // console.log(res)
                this.infoForm.commisioncode = res.data
                if (res.data) {
                    this.$message({
@@ -422,11 +394,14 @@
                this.pageParams.pageNo = pageNo
            },
            deleteRow(row) {
                console.log(row)
                row = null
            },
            upMaterialName(val){
                console.log(val);
            upMaterialName(val) {
                this.sampleoptions.forEach(a => {
                    if (a.key == val) {
                        this.addPointerForm.sampleNumber = a.code
                    }
                })
                this.getModelSpecification(val)
            }
        }