功能调整

value

2024-04-02 4da37d48c483d8c8aeb23925ccb33d57cb5a4ccf

功能调整

 src/assets/api/controller.js

@@ -14,7 +14,8 @@
        StandardTemplate,
        insOrder,
        sampleOrder,
    insOrderPlan
    insOrderPlan,
    insReport
    }
}

@@ -176,3 +177,7 @@
    delStandardTemplate: "/StandardTemplate/delStandardTemplate", //删除检验模板
    getStandardTemplate: "/StandardTemplate/getStandardTemplate", //查询原始记录模板枚举
}

const insReport = {
  pageInsReport: "/insReport/pageInsReport", //查询检验报告数据
}

 src/components/do/b1-inspect-order-plan/Inspection.vue

@@ -594,8 +594,11 @@
                        try{
                            this.param[a.id].equipValue.v.v = a.insProductResult.equipValue
                        }catch(e){}
                    try{
                        this.param[a.id].resValue.v.v = a.lastValue
                        this.param[a.id].insResult.v.v = a.insResult
                    }catch(e){
                    }
                })
                this.handleExcelMethod()
            },

 src/components/tool/value-table.vue

@@ -84,10 +84,10 @@
        :span-method="spanMethod">
                <el-table-column type="selection" width="65" v-if="data.showSelect" :key="Math.random()">
                </el-table-column>
                <el-table-column type="index" align="center" label="序号" width="70" v-if="data.isIndex" :key="Math.random()">
                <el-table-column type="index" align="center" label="序号" width="65" v-if="data.isIndex" :key="Math.random()">
                </el-table-column>
                <el-table-column :prop="a.label" :label="a.value" :sortable="data.sort==false?false:'custom'"
                    v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="160">
                    v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip min-width="155">
                    <template slot-scope="scope">
                        <div v-if="showType(a.label, data.tagField) != null">
                            <template v-if="typeof(scope.row[a.label]) == 'object'">

 src/components/tool/word.vue

@@ -124,5 +124,8 @@

</script>
<style scoped>

  .tinymce-box{
    width: 100%;
    height: 100%;
  }
</style>

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

@@ -245,9 +245,9 @@
                            font: '复核',
                            type: 'text',
                            method: 'handleReview',
                            disabFun: (row, index) => {
                                return row.userId == null || row.insState != 4
                            }
                            // disabFun: (row, index) => {
                            //     return row.userId == null || row.insState != 4
                            // }
                        }, {
                            id: '',
                            font: '认领',
@@ -401,7 +401,7 @@
                row,
                rowIndex
            }) {
                if (this.currentTime === row.appointed) {
                if (this.currentTime == row.appointed) {
                    return 'highlight-warning-row-border'
                } else if (this.currentTime > row.appointed) {
                    return 'highlight-danger-row-border'

 src/components/view/b1-report-preparation.vue

@@ -50,21 +50,15 @@
            </div>
            <div class="search">
                <div class="search_thing">
                    <div class="search_label">样品名称：</div>
          <div class="search_label">报告编号：</div>
                    <div class="search_input"><el-input size="small" placeholder="请输入" clearable
                            v-model="componentData.entity.sample" @keyup.enter.native="refreshTable()"></el-input></div>
              v-model="componentData.entity.code" @keyup.enter.native="refreshTable()"></el-input></div>
                </div>
                <div class="search_thing">
                    <div class="search_label">状态：</div>
          <div class="search_label">委托编号：</div>
                    <div class="search_input">
          <el-select v-model="componentData.entity.status" placeholder="全部" size="small">
            <el-option
              v-for="item in statusList"
              :key="item.value"
              :label="item.label"
              :value="item.value">
            </el-option>
          </el-select>
            <el-input size="small" placeholder="请输入" clearable v-model="componentData.entity.entrustCode"
              @keyup.enter.native="refreshTable()"></el-input>
          </div>
                </div>
                <div class="search_thing" style="padding-left: 30px;">
@@ -73,8 +67,8 @@
                </div>
            </div>
            <div class="table">
                <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData"
                    :key="upIndex" @handleWeave="handleWeave"/>
        <ValueTable ref="ValueTable" :url="$api.insReport.pageInsReport" :componentData="componentData"
          :key="upIndex" />
            </div>
        </div>
    <el-dialog title="在线编制" :visible.sync="claimVisible" width="80%" :modal-append-to-body="false">
@@ -100,11 +94,10 @@
                componentData: {
                    entity: {
                        entrustCode: null,
                        sample: null,
                        state: 1,
            code: null,
                        orderBy: {
                            field: 'id',
                            order: 'asc'
              order: 'desc'
                        }
                    },
                    isIndex: true,
@@ -116,36 +109,36 @@
                        type: 'text',
                        method: 'handleWeave',
                        disabFun: (row, index) => {
                            return row.state != 1
              return row.isExamine != null
                        }
                    }, {
                        id: 'download',
                        font: '下载',
                        type: 'text',
                        method: 'download',
                        disabFun: (row, index) => {
                            return row.state != 1
                        }
            method: 'download'
                    }, {
                        id: 'handleUpload',
                        font: '上传',
                        type: 'text',
                        method: 'handleUpload',
                        disabFun: (row, index) => {
                            return row.state != 0
              return row.isExamine != null
                        }
                    }, {
                        id: 'handlRestore',
                        font: '还原',
                        type: 'text',
                        method: 'handleRestore'
            method: 'handleRestore',
            disabFun: (row, index) => {
              return row.isExamine != null
            }
                    }, {
            id: 'handleIssued',
                        font: '审核',
                        type: 'text',
                        method: 'handleIssued',
                        disabFun: (row, index) => {
                            return row.state != 1 || row.sendTime != null
              return row.isExamine != null
                        }
                    }, {
            id: 'handleApprove',
@@ -153,32 +146,36 @@
                        type: 'text',
                        method: 'handleApprove',
                        disabFun: (row, index) => {
                            return row.state != 1 || row.sendTime != null
              return row.isRatify != null
                        }
                    }],
                    linkEvent:{
                      entrustCode:{
            code: {
                        method:'selectAllByOne'
                      }
                    },
                    tagField: {
                        type: {
            isRatify: {
                            select: [{
                                value: 0,
                                type: 'success',
                                label: '普通'
                type: 'danger',
                label: '不批准'
                            }, {
                                value: 1,
                                type: 'warning',
                                label: '优先'
                            }, {
                                value: 2,
                                type: 'danger',
                                label: '紧急'
                type: 'success',
                label: '批准'
                            }]
                        },
                        createUser: {
                            select: []
            isExamine: {
              select: [{
                value: 0,
                type: 'danger',
                label: '不通过'
              }, {
                value: 1,
                type: 'success',
                label: '通过'
              }]
                        }
                    },
                    selectField: {},
@@ -228,7 +225,10 @@
                this.upLoad = false;
            },
      confirmClaim(){
        console.log(11111111111,this.$refs.Word.getValue())
        console.log(this.$refs.Word.getValue())
      },
      selectAllByOne(row){
        console.log(row);
      }
        }
    }

 src/main.js

@@ -13,7 +13,7 @@

//本地
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
const javaApi = 'http://192.168.0.10:8001';//李
const javaApi = 'http://127.0.0.1:8001';//李
// const javaApi = 'http://114.132.189.42:9006';//测试服
//胜云服务器
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";

 src/util/date.js

@@ -13,9 +13,9 @@
  year = year + '-'
  let days = date.getDate()
  if (days < 10) {
    days = '0' + days + '-'
    days = '0' + days
  } else {
    days = days + '-'
    days = days
  }
  return (year + month + days)
}

 static/js/menu.js

@@ -13,7 +13,7 @@
    {
        v: "业务管理",
        i: "font icon-kexueyanjiuheshiyankaifa",
        p: "",
        p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport",
        c: [{
            v: "检验下单",
            i: "font icon-erjidaohang",
@@ -28,7 +28,7 @@
            v: "报告编制",
            i: "font icon-erjidaohang",
            u: "b1-report-preparation",
            p: ""
            p: "pageInsReport"
        }, {
            v: "费用统计",
            i: "font icon-erjidaohang",