snow 2 年之前
父节点
当前提交
4192e8eacb

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.js


+ 2 - 1
src/layout/components/company-select/index.vue

@@ -88,7 +88,8 @@ export default {
     ...mapState({
       currentCompany: state => state.user.currentCompany,
       companylist: state => state.user.companylist,
-      isSupertube: state => state.user.isSupertube
+      isSupertube: state => state.user.isSupertube,
+      sourceLevel: state => state.user.sourceLeve
     })
   },
   data: () => ({

+ 7 - 0
src/views/login/index.vue

@@ -215,6 +215,7 @@ export default {
   },
   mounted() {
     this.refreshCode()
+    this.bindEnterEvent()
     // this.getversion();
     if (this.loginForm.username === '') {
       this.$refs.username.focus()
@@ -222,7 +223,13 @@ export default {
       this.$refs.password.focus()
     }
   },
+  beforeDestroy() {
+    this.removeEnterEvent()
+  },
   methods: {
+    bindEnterEvent() { window.addEventListener('keydown', this.listener) },
+    removeEnterEvent() { window.removeEventListener('keydown', this.listener) },
+    listener(e) { e.keyCode === 13 && this.handleLogin() },
     async getversion() {
       const { code, data } = await asyncRequest.version({})
       if (code === 0) {

+ 1 - 1
src/views/purchaseIn/workbench/detail.vue

@@ -27,7 +27,7 @@
                 <li>公司编号:</li>
                 <li>{{ sitem.companyNo }}</li>
                 <li>公司名称:</li>
-                <li>{{ sitem.company }}</li>
+                <li>{{ sitem.company || '--'}}</li>
                 <li>客户名称:</li>
                 <li>{{ sitem.khname }}</li>
               </ul>

+ 7 - 10
src/views/purchaseIn/workbench/index.vue

@@ -57,17 +57,14 @@
                   >
                 </li>
 
-                <li class="fl item-li">
-                  <span class="label">公司编码:</span>
-                  <span class="label-main">
-                    {{item.companyNo}}
-                  </span>
+                <li class="fl item-li" style="wrap:nowrap;display: flex;">
+                  <span class="label" style="width:80px">业务公司编码:</span>
+                  <span class="label-main" style="flex:1">{{ item.companyNo || '--' }}</span>
                 </li>
-                <li class="fl item-li">
-                  <span class="label">公司名称:</span>
-                  <span class="label-main">
-                    {{item.company}}
-                  </span>
+
+                <li class="fl item-li" style="wrap:nowrap;display: flex;">
+                  <span class="label" style="width:80px">业务公司名称:</span>
+                  <span class="label-main" style="flex:1">{{ item.companyName || '--' }}</span>
                 </li>
               </ul>
             </div>

+ 4 - 0
src/views/supplierPurchaseIn/supplierWorkbench/detail.vue

@@ -27,6 +27,10 @@
                 <li>{{ sitem.salesman }}</li>
                 <li>到货时间:</li>
                 <li>{{ sitem.arrival_time }}</li>
+                <li>公司编号:</li>
+                <li>{{ sitem.companyNo }}</li>
+                <li>公司编码:</li>
+                <li>{{ sitem.company }}</li>
                 <li>客户名称:</li>
                 <li>{{ sitem.khname }}</li>
               </ul>

+ 10 - 0
src/views/supplierPurchaseIn/supplierWorkbench/index.vue

@@ -56,6 +56,16 @@
                     {{ item.original_price }}元/{{ item.num }}{{ unit }}</span
                   >
                 </li>
+
+                <li class="fl item-li" style="wrap:nowrap;display: flex;">
+                  <span class="label" style="width:80px">业务公司编码:</span>
+                  <span class="label-main" style="flex:1">{{ item.companyNo }}</span>
+                </li>
+
+                <li class="fl item-li" style="wrap:nowrap;display: flex;">
+                  <span class="label" style="width:80px">业务公司名称:</span>
+                  <span class="label-main" style="flex:1">{{ item.companyName }}</span>
+                </li>
               </ul>
             </div>
             <div class="no-data">暂无数据!</div>

部分文件因为文件数量过多而无法显示