完成设备明细新增页面调整

licp

2024-03-18 4f3dcd0320e21fc31f1669a23cedfa28572b8c85

完成设备明细新增页面调整

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

@@ -41,6 +41,12 @@
        font-size: 18px;
    }

  .el-select-dropdown__item {
    display: flex;
    align-items: center;
    justify-content: space-between;
  }

</style>
<style>
    .ins_order_add .el-input-group__append,
@@ -82,13 +88,16 @@
            <el-row class="title">
                <el-col :span="6" style="padding-left: 20px;">委托单信息</el-col>
                <el-col :span="18" style="text-align: right;">
                    <el-select v-model="template" size="medium" placeholder="下单模板" style="margin-right: 10px;" v-show="active<2">
                        <el-option v-for="(a, ai) in templates" :key="ai" :value="a.value" :label="a.label"></el-option>
                    <el-select v-model="template" size="medium" placeholder="下单模板" style="margin-right: 10px;" v-show="active==1">
                        <el-option v-for="(a, ai) in templates" :key="ai" :value="a.value" :label="a.label">
              <span style="float: left">{{ a.label }}</span>
              <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px" @click.stop="handleDelete"></i>
            </el-option>
                    </el-select>
                    <el-button size="medium" @click="" v-show="active<2">
                    <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="save" :loading="saveLoad" v-show="active<2">提交</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">审核不通过</el-button>
          <el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad" v-show="active==3">审核通过</el-button>
                    <el-button size="medium" @click="$parent.playOrder(0)">
@@ -160,14 +169,14 @@
            </el-row>
        </div>
        <div>
            <div style="text-align: right;line-height: 45px;">
                <el-button type="primary" size="small" @click="addSampleDia = true" v-show="active<2">添加样品</el-button>
            <div style="text-align: right;line-height: 45px;" v-if="active<2">
                <el-button type="primary" size="small" @click="addSampleDia = true"  >添加样品</el-button>
                <el-button size="small" @click="delSample">
                    <span style="color: #3A7BFA;" v-show="active<2">删除样品</span>
                    <span style="color: #3A7BFA;">删除样品</span>
                </el-button>
            </div>
            <el-table class="el-table" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" border
                @selection-change="selectSample" highlight-current-row @row-click="rowClick">
            <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark" border
                @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
                <el-table-column type="selection" width="60"></el-table-column>
                <el-table-column type="index" label="序号" width="65" align="center"></el-table-column>
                <el-table-column prop="sample" label="样品名称" align="center" show-overflow-tooltip
@@ -340,6 +349,18 @@
                <el-button type="primary" @click="onSample()" :loading="getProductLoad">确 定</el-button>
            </span>
        </el-dialog>
    <el-dialog title="保存模板" :visible.sync="templateDia" width="30%">
            <div class="body" style="height: 10vh;display: flex;align-items: center;" v-if="templateDia">
        <div class="search_label"><span class="required-span">* </span>模板名称：</div>
        <div class="search_input">
          <el-input size="small" clearable v-model="templateName"></el-input>
        </div>
            </div>
            <span slot="footer" class="dialog-footer">
                <el-button @click="templateDia = false">取 消</el-button>
                <el-button type="primary" @click="addTemplateDia" :loading="templateLoading">确 定</el-button>
            </span>
        </el-dialog>
    </div>
</template>

@@ -362,7 +383,12 @@
        data() {
            return {
                template: null,
                templates: [],
                templates: [
          {
            label:'0000',
            value:1
          }
        ],
                addObj: {
                    entrustCode: null,
                    custom: null,
@@ -426,7 +452,10 @@
                productList: [],
                productIds: [],
                getProductLoad: false,
                saveLoad: false
                saveLoad: false,
        templateDia:false,
        templateLoading:false,
        templateName:''
            }
        },
        mounted() {
@@ -443,7 +472,10 @@
                }).then(res => {
          this.addObj = {...res.data.insOrder};
          this.addObj.type = String(this.addObj.type)
          this.sampleList = res.data.sampleProduct
          this.sampleList = this.HaveJson(res.data.sampleProduct);
          this.$nextTick(()=>{
            this.$refs.sampleTable.doLayout()
          })
                })
      }
        },
@@ -659,7 +691,35 @@
                    return 'warning-row';
                }
                return '';
            }
            },
      // 删除模板--调用接口
      handleDelete(){
        this.$confirm('是否删除当前数据?', "警告", {
                            confirmButtonText: "确定",
                            cancelButtonText: "取消",
                            type: "warning"
                        }).then(() => {
                            // this.$axios.post(this.delUrl, {
                            //     id: row.id
                            // }).then(res => {
                            //     if (res.code === 201) {
                            //         return
                            //     }
                            //     this.$message.success('删除成功')
                            //     this.selectList()
                            // }).catch(e => {
                            //     this.$message.error('删除失败')
                            // })
                        }).catch(() => {})
      },
      // 保存模板
      addTemplateDia(){
        if(this.templateName){
          this.templateLoading = true;
        }else{
          this.$message.error('请填写模板名称')
        }
      }
        }
    }
</script>

 src/components/view/a6-device-management.vue

@@ -155,7 +155,7 @@
                    :key="item.value"
                    :label="item.label"
                    :value="item.value"
                    > 
                    >
                  </el-option>
                </el-select>
              </el-form-item>
@@ -331,7 +331,7 @@
      <el-col  :span="7" >
        <el-col>
          <!-- 图片 -->
          <el-image class="img" style="width:100%;height: 320px;marginBottom:16px" :src="javaApi+'/img/'+formData2.imageUpload">
          <el-image class="img" style="width:100%;height: 320px;margin-bottom:16px" :src="javaApi+'/img/'+formData2.imageUpload">
            <div slot="error" class="image-error" style="width: calc(100% -2px);
          height: 318px;
          border-radius: 16px;
@@ -503,12 +503,12 @@
            <el-form-item label="校准证书:" >
            <el-input v-model="formData2.calibrationCerticate" size="small"></el-input>
            </el-form-item>
            <el-form-item v-if="!isUp" label="图片:" >
            <el-form-item label="图片:" >
              <div style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
                <div v-show="formData2.imageName" class="picName">{{formData2.imageName}}</div>
                <el-upload
                    :action="action"
                    :on-success="handleSuccessUpImg"
                    :on-success="handleSuccessUpImg2"
                    :show-file-list="false"
                    accept='image/jpg,image/jpeg,image/png'
                    :headers="headers"
@@ -526,7 +526,7 @@
    <span slot="footer" class="dialog-footer">
      <el-row >
        <el-button @click="handleClose2">取 消</el-button>
      <el-button type="primary" @click="submitForm" :loading="upLoad">确 定</el-button>
      <el-button type="primary" @click="submitForm2" :loading="upLoad2">确 定</el-button>
      </el-row>
    </span>
  </el-dialog>
@@ -544,7 +544,10 @@
                //是否是档案修订  true不是 false是
                isUp: true,
                formData: {},
        formData2: {},
        formData2: {
          imageUpload:'',
          imageName:''
        },
                value: '',
                options: [],
                labelPosition: 'right',
@@ -615,6 +618,7 @@
        // 设备状态列表
        deviceStatusList:[],
        upLoad:false,
        upLoad2:false,
            }
        },
    computed: {
@@ -751,6 +755,14 @@
          this.formData.imageName = response.data.name;
        }
      },
      handleSuccessUpImg2(response,){
        if(response.code==200){
          this.$nextTick(()=>{
            this.formData2.imageUpload = response.data.url;
            this.formData2.imageName = response.data.name;
          })
        }
      },
      submitForm(){
        this.upLoad = true;
        let authorizedPerson = this.formData.authorizedPerson.length>0?this.formData.authorizedPerson.join(','):''
@@ -780,6 +792,8 @@
      },
      submitForm2(){
        this.upLoad2 = true;
        let authorizedPerson = this.formData2.authorizedPerson.length>0?this.formData2.authorizedPerson.join(','):''
        this.formData2.authorizedPerson = authorizedPerson
        this.$axios.post(this.$api.deviceScope.addDeviceParameter, this.formData2, {
                    headers: {
                        'Content-Type': 'application/json'
@@ -789,12 +803,16 @@
                        this.upLoad2 = false
                        return
                    }
                    this.$message.success('修改成功')
          this.upLoad = false
                    this.$message.success('提交成功')
          this.upLoad2 = false
                    this.refreshTable()
          this.dialogVisible2 = false
          this.formData2 = {
            imageUpload:'',
            imageName:''
          }
                }).catch(e => {
                    this.$message.error('修改失败')
                    this.$message.error('提交失败')
                    this.dialogVisible2 = false
                    this.upLoad2 = false
                })

 src/components/view/b1-inspect-order-plan.vue

@@ -127,7 +127,7 @@
                :url="$api.insOrderPlan.selectInsOrderPlanList" :upUrl="$api.user.updateUser" :componentData="componentData"
                :key="upIndex" @upUser="upUser" />
        </div>
        <el-dialog title="提示" :visible.sync="claimVisible" width="40%">
        <el-dialog title="提示" :visible.sync="claimVisible" width="400px">
            是否认领委托编号<span style="color:#33C130">{{sampleUserForm.entrustCode}}</span>的任务
            <span slot="footer" class="dialog-footer">
                <el-button @click="claimVisible = false">取 消</el-button>
@@ -364,4 +364,4 @@
            }
        }
    }
</script>
</script>