修改委托

value

2023-08-24 3df13852542ab81e8b6bdd1a109bde42ae5355a7

修改委托

 .env.development

@@ -2,4 +2,4 @@
ENV = 'development'

# base api
VUE_APP_BASE_API =  'http://192.168.110.167:1234/'
VUE_APP_BASE_API =  'http://localhost:1234/'

 src/router/index.js

@@ -477,7 +477,7 @@
]

const createRouter = () => new Router({
  // mode: 'history', // require service support
  mode: 'history',
  scrollBehavior: () => ({ y: 0 }),
  routes: constantRoutes
})

 src/views/inspectionManagement/commissionInspection/addCommision.vue

@@ -5,7 +5,8 @@
      <div class="title">委托信息</div>
      <div class="tableBox">
        <div class="tableBox-header">
        <el-button class="split" @click="dialogueFormVisible = true" type="primary" size="small" style="background-color: rgb(1, 102, 226);">添加样品</el-button>
                        <el-button class="split" @click="dialogueFormVisible = true" type="primary" size="small"
                            style="background-color: rgb(1, 102, 226);">添加样品</el-button>
<!--        <el-input
          v-model="searchData"
          class="input-form split"
@@ -16,48 +17,16 @@
        </el-input>-->
        <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">重置</el-button>
      </div>
        <el-table
                ref="detectionInfo"
                :max-height="800"
                :cell-style="{textAlign: 'center'}"
                    <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%"
              >
                <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%"
                />
                <el-table-column
                  prop="specificationsModels"
                  label="规格型号"
                  min-width="10%"
                />
                <el-table-column
                  prop="unit"
                  label="单位"
                  min-width="8%"
                />
                <el-table-column
                  prop="samplesNumber"
                  label="数量"
                  min-width="8%"
                />
                <el-table-column
                  prop="addway"
                  label="添加方式"
                  min-width="8%">
                        :data="detectionInfo" style="width: 100%">
                        <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%" />
                        <el-table-column prop="specificationsModels" label="规格型号" min-width="10%" />
                        <el-table-column prop="unit" label="单位" min-width="8%" />
                        <el-table-column prop="samplesNumber" label="数量" min-width="8%" />
                        <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>
@@ -68,39 +37,15 @@
                    <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%"
                >
                        <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">
                    <el-button type="text" size="small">修改</el-button>
                    <el-button type="text" size="small" @click="deleteRow(scope.row)">删除</el-button>
                  </template>
                </el-table-column>
              </el-table>
              <!-- 分页器 -->
              <div>
                <el-pagination
                  class="pagination"
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  :current-page="currentPage"
                  :page-sizes="[100, 200, 300, 400]"
                  :page-size="100"
                  layout="total, sizes, prev, pager, next, jumper"
                  :total="400">
                </el-pagination>
              </div>
      </div>
      <div class="secondBox">
        <el-row class="header">
@@ -110,12 +55,14 @@
            <!-- <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" size="mini" >
                    <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px"
                        size="mini">
              <div class="formwrapper">
                  <el-row :gutter="200">
                        <el-col :span="5">
                        <el-form-item label="委托编号：">
                            <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled="true" autocomplete="off" />
                                        <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled
                                            autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col :span="5">
@@ -137,33 +84,27 @@
                    <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: 160px;" v-model="infoForm.address" placeholder="请输入联系地址"
                                            autocomplete="off" />
                        </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: 160px;">
                            </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: 160px;">
                            </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-option v-for="options in sampleDeliveryMode" :key="options.key" :value="options.value">{{ options.value }}</el-option>
                                            <el-option v-for="options in sampleDeliveryMode" :key="options.key"
                                                :value="options.value">{{ options.value }}</el-option>
                            </el-select>
                        </el-form-item>
                        </el-col>
@@ -176,7 +117,8 @@
                        </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: 160px;" v-model="infoForm.sendertel" placeholder="请输入送样人电话"
                                            autocomplete="off" />
                        </el-form-item>
                        </el-col>
                        <el-col :span="5">
@@ -192,7 +134,8 @@
                    </el-row>
                    </div>
                    <div class="submitBtn">
                      <el-button type="primary" size="small" @click="submitInspection" style="background-color: rgb(1, 102, 226);">提交</el-button>
                            <el-button type="primary" size="small" @click="submitInspection"
                                style="background-color: rgb(1, 102, 226);">提交</el-button>
                      <!-- 点击返回，当前页面值为false -->
                      <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">打印委托单</el-button>
                    </div>
@@ -200,24 +143,22 @@
      </div>
    </div>
    <div class="checkType">
      <el-dialog
        title="添加指标"
        :visible.sync="dialogueFormVisible"
        width="40%"
      >
        <el-form :model="addPointerForm" ref="addPointerForm" class="addPointerForm" label-position="right" label-width="100px" size="mini">
                <el-dialog title="添加指标" :visible.sync="dialogueFormVisible" width="40%">
                    <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-form-item label="样品编号：">
                <el-select style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small" placeholder="请选择样品编号">
                  <el-option v-for="options in samplecodeoptions" :value="options.value" :key="options.key" >{{ options.value }}</el-option>
                </el-select>
                                    <el-input style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small" disabled>
                                    </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="10">
              <el-form-item label="样品名称：">
                <el-select style="width: 160px;" v-model="addPointerForm.sampleName" size="small" placeholder="请选择样品名称">
                  <el-option v-for="options in sampleoptions" :value="options.value" :key="options.key">{{ options.value }}</el-option>
                                    <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>
              </el-form-item>
            </el-col>
@@ -225,26 +166,31 @@
          <el-row :gutter="50">
            <el-col :span="10">
              <el-form-item label="规格型号：">
                <el-select style="width: 160px;" 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 style="width: 160px;" 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-form-item label="样品单位：">
                <el-input style="width: 160px" type="text" v-model="addPointerForm.unit" placeholder="请输入单位" autocomplete="off" />
                                    <el-input style="width: 160px" 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-form-item label="样品数量：">
                <el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量" autocomplete="off" />
                                    <el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="请输入数量"
                                        autocomplete="off" />
              </el-form-item>
            </el-col>
            <el-col :span="10">
              <el-form-item label="备注：">
                <el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="请输入备注" autocomplete="off" />
                                    <el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="请输入备注"
                                        autocomplete="off" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -252,7 +198,8 @@
            <el-col :span="10">
              <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>
                                        <el-checkbox v-for="expers in experList" :label="expers.label"
                                            :key="expers.key">{{ expers.label }}</el-checkbox>
                </el-checkbox-group>
              </el-form-item>
            </el-col>
@@ -269,7 +216,13 @@
</template>

<script>
import {getSampleName, getModelSpecification, getlink, addInspection} from '@/api/inspection/commisioninspection'
    import {
        getSampleName,
        getModelSpecification,
        getlink,
        addInspection,
        isIfViewUUID
    } from '@/api/inspection/commisioninspection'
export default {
  data() {
    return {
@@ -324,13 +277,7 @@
        key:'1',
        value: ''
      }],
      model_spe_options:[{
        key:'1',
        value: '选项1'
      },{
        key: '2',
        value: '选项2'
      }],
                model_spe_options: [],
      sampleDeliveryMode:[{
        key: '1',
        value: '送样'
@@ -339,43 +286,47 @@
        value: '上门'
      }],
      dialogueFormVisible: false,
      showDetail: false
                showDetail: false,
                viewId: null
    }
  },
  created(){
    this.getlink()
            this.viewId = this.$route.params.viewId
            this.$store.commit('settings/SAVE_LINK',this.viewId)
            this.getlink(this.$route.params.viewId)
  },
  mounted(){
    this.getSampleName()
    this.getModelSpecification()
  },
  methods: {
    // 获取链接link
    getlink(){
      getlink().then((result)=>{
        this.$store.commit('settings/SAVE_LINK',result.data)
        console.log(this.$store.state.settings.link)
            getlink(viewId) {
                if (viewId == null) {
                    this.$message.error('当前链接不在有效期内,系统自动关闭')
                    this.$router.push('/404')
                    return
                }
                isIfViewUUID({
                    viewId
                }).then(res => {
                    if (!res.data) {
                        this.$message.error('当前链接不在有效期内,系统自动关闭')
                        this.$router.push('/404')
                    }
      })
    },
    async getSampleName(){
      const res = await getSampleName()
      // console.log('res',res.data)
      this.sampleoptions = res.data.map((item)=>{
        return{
          key:item.id.toString(),
          value:item.name
        }
      })
      this.samplecodeoptions = res.data.map((item)=>{
        return{
          key:item.id.toString(),
          value:item.code
        }
      })
    },
    async getModelSpecification(){
      const res = await getModelSpecification({materialId: '1'})
      // console.log(res)
            async getModelSpecification(val) {
                const res = await getModelSpecification({
                    materialId: val
                })
      this.model_spe_options = res.data.map((item)=>{
        return{
          key:item.specificationsId,
@@ -412,7 +363,8 @@
      }else{
        sampledeliveryway = 2
      }
      const res = await addInspection({completionDeadline: this.infoForm.deadline,
                const res = await addInspection({
                    completionDeadline: this.infoForm.deadline,
        contactAddress: this.infoForm.address,
        contactNumber: this.infoForm.tel,
        contacts: this.infoForm.contacter,
@@ -423,7 +375,8 @@
        reportNumber: parseInt(this.infoForm.num),
        sampleDeliveryMode: sampledeliveryway,
        sampleDeliveryPhone: this.infoForm.sendertel,
        sampleSender: this.infoForm.sender})
                    sampleSender: this.infoForm.sender
                })
//       const res = await addInspection({
//   completionDeadline: "2023-08-03",
//   contactAddress: "江苏南通",
@@ -471,16 +424,16 @@
    deleteRow(row){
      console.log(row)
      row = null
            },
            upMaterialName(val){
                console.log(val);
                this.getModelSpecification(val)
    }
  }
}
</script>

<style lang="scss" scoped>
.add_commision{
  padding: 20px;
}

.content-main{
  padding: 20px 40px;
  background-color: #f0f2f5;
@@ -494,25 +447,30 @@
    background-color: #0166e2;
    color: #fff;
    border-radius: 4px;
                margin-bottom: 20px;
  }

  .tableBox{
    background-color: #fff;
    padding: 0px 20px;
    margin: 0px -15px;
    flex: 1;
    background: #fff;
    /* padding: 20px 20px 10px 20px; */
    display: flex;
    flex-direction: column;

    .tableBox-header{
      padding: 20px 0px;

      .split{
        margin-right: 15px;
      }
    }

          .el-table {
            flex: 1;
          }

          >div:nth-child(3){
            display: flex;
            justify-content: end;
@@ -520,14 +478,16 @@
          }
  }
}

.secondBox{
  margin: 0px -15px;

  .header{
    display: flex;
    justify-content: space-between;
    padding: 10px 20px;
    margin-top: 10px;
  }

  .submitBtn{
    display: flex;
    justify-content: end;
@@ -535,12 +495,15 @@
    margin-top: 20px;
  }
}

.infoForm{
  background-color: #fff;
  padding: 20px 50px;

  .formwrapper{
    margin: 20px 0px;
    padding-left: 30px;

    .el-row{
      margin: 10px 0px;
    }

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -339,23 +339,18 @@
        display: flex;
        justify-content: space-between;
        padding: 5px 24px 0px 24px;
    }

.top-bar{
    margin: -25px -15px;
    background: #fff;
    display: flex;
    justify-content: space-between;
    padding: 5px 24px 0px 24px;
    .sermargin{
      margin-right: 60px;
    }

    .rightForm{
      display: flex;
      justify-content: space-between;
      /* background-color: #bfa; */
      height: 40px;
      line-height: 40px;

      >div{
        padding: 0px 10px;
        padding-bottom: 10px;
@@ -364,6 +359,7 @@
        /* height: 40px;
        line-height: 40px; */
      }

      .rightBtn{
        background-color: rgb(1, 102, 226);
      }
@@ -377,14 +373,17 @@
      margin-top: 40px;
      display: flex;
      flex-direction: column;

      .table-header{
        padding: 20px;
        display: flex;
        justify-content: space-between;

        .el-form-item{
          margin-bottom: 30px !important;
        }
      }

      .table-box{
          padding: 0px 20px;
          margin-top: 0px;
@@ -393,9 +392,11 @@
          /* padding: 20px 20px 10px 20px; */
          display: flex;
          flex-direction: column;

          .el-table {
            flex: 1;
          }

          >div:nth-child(2){
            display: flex;
            justify-content: end;