licp
2024-09-30 77fad81725d273ad7d515b1d98fa3e7c2b20be06
样机编号完成40%
已修改4个文件
29 ■■■■ 文件已修改
src/assets/api/controller.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-ins-order/add.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspection-order.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/api/controller.js
@@ -183,6 +183,7 @@
  export: "/insOrder/export", //导出
  selectNoProducts: "/insOrder/selectNoProducts", //导出
  checkUpdate: "/insOrder/checkUpdate", //撤销审核通过
  checkNumber: "/insOrder/checkNumber",
}
const sampleOrder = {
src/components/do/b1-ins-order/add.vue
@@ -362,6 +362,17 @@
              </el-date-picker>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6">
            <div class="search_label"><span class="required-span">* </span>样机完成时间:</div>
            <div class="search_input">
              <el-date-picker
                v-model="addObj.issueTime"
                type="date"
                placeholder="选择日期"
                size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
              </el-date-picker>
            </div>
          </el-col>
          <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
            <div class="search_label">备注:</div>
            <div class="search_input">
@@ -1026,6 +1037,7 @@
          type: '0',
          code: null,
          appointed: null,
          issueTime:null,
          remark: null,
          otcCode: null,
          mating: 0,
@@ -1052,7 +1064,6 @@
          departmentLimsId:null,
          departmentLims:null,
          partNo: null, // 零件号
          appointed:null,
        },
        sample: {
          sampleCode: null,
@@ -1791,6 +1802,8 @@
          this.$message.error('请输入样品型号')
        }else if (!this.addObj.appointed) {
          this.$message.error('请选择约定时间')
        }else if (!this.addObj.issueTime) {
          this.$message.error('请选择样机完成时间')
        } else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
          this.$message.error('请选择检验标准')
        } else if(this.addObj.formType&&this.addObj.formType!='其他成品'&&!this.addObj.issueUser){
src/components/view/b1-inspection-order.vue
@@ -790,6 +790,12 @@
      selectMethod(val){
        this.multipleSelection = val
      },
      async searchPrint(selection){
        let res = await this.$axios.post(this.$api.insOrder.checkNumber,{
          ids:selection.map(m=>m.id).join(',')
        })
        console.log(1111,res)
      },
      getLabelPrinting(selection){
        this.loadPint = true;
        this.$axios.post(this.$api.insOrder.labelPrinting,{
@@ -862,12 +868,13 @@
              font_size: '0.20cm',
        });
      },
      print(){
      async print(){
        if(this.multipleSelection.length==0){
            this.$message.warning('请选择一条数据')
            return
        }
        let selection = this.multipleSelection
        await this.searchPrint(selection)
        this.getLabelPrinting(selection)
        this.printDialogVisible = true
      },
src/main.js
@@ -20,11 +20,11 @@
//本地
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
const javaApi = 'http://172.20.10.5:8001';
// const javaApi = 'http://172.20.10.5:8001';
// //通信测试库
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
// const javaApi = 'http://10.1.13.77:8001';
const javaApi = 'http://10.1.13.77:8001';
//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";