Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/utils/request.js

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.103:8005/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 export default service

src/views/ManufacturingCenter/EquipmentMonitoring/index.vue

@@ -0,0 +1,387 @@
+<template>
+  <el-card>
+    <div class="process">
+      <div style="position: relative;left:39px;top:375px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME137 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:382px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME138 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:389px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME139 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:396px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME140 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:403px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME141 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:410px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME142 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:417px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME143 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:39px;top:424px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME144 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:140px;top:395px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 11px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME136 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:25px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME101 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:48px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME102 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:64px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME103 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:60px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME104 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:892px;top:76px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 9px"/><div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME105 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:48px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME106 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:43px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME107 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:38px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME108 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:32px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME109 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:27px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME110 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:21px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME111 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:788px;top:15px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME112 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:889px;top:-300px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME113 }}</div><div class="circle"/><div class="fang" style="margin-left: 12px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:889px;top:-245px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME114 }}</div><div class="circle"/><div class="fang" style="margin-left: 12px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:895px;top:-163px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME115 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:895px;top:-128px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME116 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:895px;top:-124px; width: 100px;height: 28px;">
+        <el-row>
+          <div style="float: left;text-align: center;width: 60px;line-height: 12px;font-size: 15px;font-weight: bold">{{ OPNAME117 }}</div><div class="circle"/><div class="fang" style="margin-left: 9px"/>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1022px;top:-326px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME118 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1022px;top:-311px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME119 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1022px;top:-295px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME120 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1020px;top:-190px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME121 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1020px;top:-120px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME122 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1118px;top:-585px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME123 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1118px;top:-568px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME124 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1118px;top:-553px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME125 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1118px;top:-537px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME126 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1124px;top:-341px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME127 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1120px;top:-319px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME128 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1270px;top:-769px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME129 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1270px;top:-759px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME130 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1270px;top:-719px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME131 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1270px;top:-649px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME132 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1273px;top:-640px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 10px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME133 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1270px;top:-545px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME134 }}</div>
+        </el-row>
+      </div>
+      <div style="position: relative;left:1270px;top:-535px; width: 100px;height: 28px;">
+        <el-row>
+          <div class="fang"/><div class="circle" style="margin-left: 13px"/><div style="float: left;text-align: center;width: 50px;line-height: 12px;font-size: 15px;font-weight: bold;margin-left: 3px">{{ OPNAME135 }}</div>
+        </el-row>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>import { wsuri, name } from '@/utils/request'
+export default {
+  data() {
+    return {
+      socketConnect: true,
+      OPNAME101: 'OP1010',
+      OPNAME102: 'OP1020',
+      OPNAME103: 'OP1030',
+      OPNAME104: 'OP1040',
+      OPNAME105: 'OP1050',
+      OPNAME106: 'OP1060',
+      OPNAME107: 'OP1070',
+      OPNAME108: 'OP1080',
+      OPNAME109: 'OP1090',
+      OPNAME110: 'OP1100',
+      OPNAME111: 'OP1110',
+      OPNAME112: 'OP1120',
+      OPNAME113: 'OP1130',
+      OPNAME114: 'OP1140',
+      OPNAME115: 'OP1150',
+      OPNAME116: 'OP1160',
+      OPNAME117: 'OP1170',
+      OPNAME118: 'OP1180',
+      OPNAME119: 'OP1190',
+      OPNAME120: 'OP1200',
+      OPNAME121: 'OP1210',
+      OPNAME122: 'OP1220',
+      OPNAME123: 'OP1230',
+      OPNAME124: 'OP1240',
+      OPNAME125: 'OP1250',
+      OPNAME126: 'OP1260',
+      OPNAME127: 'OP1270',
+      OPNAME128: 'OP1280',
+      OPNAME129: 'OP1290',
+      OPNAME130: 'OP1300',
+      OPNAME131: 'OP1310',
+      OPNAME132: 'OP1320',
+      OPNAME133: 'OP1330',
+      OPNAME134: 'OP1340',
+      OPNAME135: 'OP1350',
+      OPNAME136: 'OP1360',
+      OPNAME137: 'OP1370',
+      OPNAME138: 'OP1380',
+      OPNAME139: 'OP1390',
+      OPNAME140: 'OP1400',
+      OPNAME141: 'OP1410',
+      OPNAME142: 'OP1420',
+      OPNAME143: 'OP1430',
+      OPNAME144: 'OP1440'
+    }
+  },
+  mounted() {
+    this.connect()
+  },
+  methods: {
+    /* socket连接*/
+    connect() {
+      if (this.socketConnect === true) {
+        this.initWebsocket()
+      } else {
+        this.websocketclose()
+      }
+    },
+    // 初始化websocket
+    initWebsocket() {
+      this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
+      this.websock.onopen = this.websocketopen
+      this.websock.onmessage = this.websocketonmessage
+      this.websock.onerror = this.websocketerror
+    },
+    // 打开
+    websocketopen() {
+      console.log('WebSocket连接成功')
+      this.websock.send('{<' + name + '>}')
+    },
+    // 数据接收
+    websocketonmessage(msg) {
+      this.msg = msg
+      const aa = this.msg.data.split('|')
+      console.log(aa[1])
+      // if (aa[1] === '') {
+      //
+      // } else if (aa[1] === '') {
+      //
+      // }
+    },
+    // 关闭
+    websocketclose() {
+      this.websock.close()
+    },
+    // 失败
+    websocketerror() {
+      console.log('WebSocket连接失败')
+      this.socketConnect = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .process{
+    text-align: center;
+    margin-left: 0px;
+    margin-top: 0px;
+    width: 1690px;
+    height: 830px;
+    /*border: 1px solid red;*/
+    background: url('../../../assets/img/img22.png') repeat;
+    background-repeat:no-repeat;
+    background-size:100% 100%;-moz-background-size:100% 100%;
+  }
+  .circle{
+    float: left;
+    width: 10px;
+    height: 10px;
+    background-color:limegreen;
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+  }
+  .circle1{
+    float: left;
+    width: 10px;
+    height: 10px;
+    background-color:yellow;
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+  }
+  .circle2{
+    float: left;
+    width: 10px;
+    height: 10px;
+    background-color:gray;
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+  }
+  .circle3{
+    float: left;
+    width: 10px;
+    height: 10px;
+    background-color:red;
+    border-radius: 50%;
+    -moz-border-radius: 50%;
+    -webkit-border-radius: 50%;
+  }
+  .fang{
+    float: left;
+    width: 10px;
+    height: 10px;
+    background-color:limegreen;
+  }
+  .fang1{
+    float: left;
+    width: 10px;
+    height: 10px;
+    background-color:yellow;
+  }
+</style>

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -800,23 +800,29 @@ export default {
         }
       })
       if (this.contractNumValue) {
-        this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', {
+        if (this.demoRadio) {
-          confirmButtonText: '确定',
+          this.$confirm('此采购合同将递交审批，递交后该合同不可删除，确认完成编辑？', '提示', {
-          cancelButtonText: '取消',
+            confirmButtonText: '确定',
-          type: 'warning'
+            cancelButtonText: '取消',
-        }).then(() => {
+            type: 'warning'
-          doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => {
+          }).then(() => {
-            if (response.data[0].result === '1') {
+            doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => {
-              this.$message.success('合同生成成功')
+              if (response.data[0].result === '1') {
-              this.reload()
+                this.$message.success('合同生成成功')
-            } else { this.$message.error('生成合同失败') }
+                this.reload()
+              } else {
+                this.$message.error('生成合同失败')
+              }
+            })
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '已取消操作'
+            })
           })
-        }).catch(() => {
+        } else {
-          this.$message({
+          this.$message.warning('请先选择模板进行预览')
-            type: 'info',
+        }
-            message: '已取消操作'
-          })
-        })
       } else {
         this.$message.warning('请先选择合同进行编辑')
       }