licp
2024-10-28 e703b41ee825c66016f5f0fb80b5564d901ae666
优化出入库
已修改4个文件
已删除6个文件
5188 ■■■■■ 文件已修改
src/components/do/b1-inspect-order-plan/Inspection.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/circuit.vue 278 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-material-ins-order/customs-inspection.vue 2577 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-material-ins-order/material-cable-config.vue 311 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-material-ins-order/material-equip-config.vue 591 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-material-ins-order/material-fiberoptic-config.vue 1049 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-inspect-order-plan.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-material-inspection-order.vue 273 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b1-sample.vue 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -918,7 +918,6 @@
<script>
  import ValueTable from '../../tool/value-table.vue'
  import Circuit from './circuit.vue'
  import file from '../../../util/file'
  import excelFunction from '../../../util/excelFountion'
  import CircuitParameters1 from './circuit-parameters1.vue'
@@ -930,7 +929,6 @@
    props: ['sonLaboratory', 'orderId', 'state','inspectorList','version','orderStateId','isLook','num1','noBack'],
    components: {
      ValueTable,
      Circuit,
      CircuitParameters1,
      CircuitParameters2,
      filePreview,
src/components/do/b1-inspect-order-plan/circuit.vue
ÎļþÒÑɾ³ý
src/components/do/b1-material-ins-order/customs-inspection.vue
ÎļþÒÑɾ³ý
src/components/do/b1-material-ins-order/material-cable-config.vue
ÎļþÒÑɾ³ý
src/components/do/b1-material-ins-order/material-equip-config.vue
ÎļþÒÑɾ³ý
src/components/do/b1-material-ins-order/material-fiberoptic-config.vue
ÎļþÒÑɾ³ý
src/components/view/b1-inspect-order-plan.vue
@@ -367,7 +367,6 @@
          </el-table-column>
        </el-table>
            </el-dialog>
      <input type="text" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"  autocomplete="off"></input>
    <el-dialog title="扫码检验" :visible.sync="qrCodeVisible" width="350px">
      <el-row>
        <el-col class="search_thing" :span="24">
@@ -677,36 +676,6 @@
        this.initializeSortable();
      }
        },
    watch:{
      qrCodeVisible(newVal){
        if(newVal){
          // this.$message.success('扫码:打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码:关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
      exportVisible(newVal){
        if(newVal){
          // this.$message.success('扫码:打开')
          let input = document.getElementById('ScanCodeInfo');
          input.focus();
          this.startTime = setInterval(()=>{
            input.focus()
          },1000)
        }else{
          // this.$message.warning('扫码:关闭')
          clearInterval(this.startTime)
          this.sampleCode = ''
        }
      },
    },
        methods: {
      selectList () {
        this.$axios.get(this.$api.warehouse.selectWarehouse).then(res => {
src/components/view/b1-material-inspection-order.vue
ÎļþÒÑɾ³ý
src/components/view/b1-sample.vue
@@ -366,7 +366,7 @@
        <el-button type="primary" @click="confirmShelves" :loading="upLoadShelves">ç¡® å®š</el-button>
      </span>
    </el-dialog>
    <input type="password" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"></input>
    <!-- <input type="password" id="ScanCodeInfo" v-model="codeInfo" @keyup.enter="keyup" style="opacity: 0;height: 0px;margin: 0px;padding: 0px;position: absolute;top: 0;"></input> -->
  </div>
</template>
@@ -412,39 +412,39 @@
        codeInfo:null,
      }
    },
    watch:{
      storageVisible(newVal){
        if(newVal){
            // this.$message.success('扫码:打开')
            let input = document.getElementById('ScanCodeInfo');
            input.focus();
            this.startTime = setInterval(()=>{
                input.focus()
            },1000)
        }else{
            // this.$message.warning('扫码:关闭')
            clearInterval(this.startTime)
        }
      },
      exportVisible(newVal){
        if(newVal){
            // this.$message.success('扫码:打开')
            let input = document.getElementById('ScanCodeInfo');
            input.focus();
            this.startTime = setInterval(()=>{
                input.focus()
            },1000)
        }else{
            // this.$message.warning('扫码:关闭')
            clearInterval(this.startTime)
        }
      },
      isEdit(newVal){
        if(!newVal){
          this.shelves = {}
        }
      }
    },
    // watch:{
    //   storageVisible(newVal){
    //     if(newVal){
    //         // this.$message.success('扫码:打开')
    //         let input = document.getElementById('ScanCodeInfo');
    //         input.focus();
    //         this.startTime = setInterval(()=>{
    //             input.focus()
    //         },1000)
    //     }else{
    //         // this.$message.warning('扫码:关闭')
    //         clearInterval(this.startTime)
    //     }
    //   },
    //   exportVisible(newVal){
    //     if(newVal){
    //         // this.$message.success('扫码:打开')
    //         let input = document.getElementById('ScanCodeInfo');
    //         input.focus();
    //         this.startTime = setInterval(()=>{
    //             input.focus()
    //         },1000)
    //     }else{
    //         // this.$message.warning('扫码:关闭')
    //         clearInterval(this.startTime)
    //     }
    //   },
    //   isEdit(newVal){
    //     if(!newVal){
    //       this.shelves = {}
    //     }
    //   }
    // },
    mounted() {
      this.selectList()
    },
src/main.js
@@ -21,11 +21,15 @@
//本地
// 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 = "https://ztwxlims.ztt.cn:7443";
// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
//云
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";