695593266@qq.com hai 6 meses
pai
achega
87a9815842

+ 15 - 1
src/views/pick/pickApply/components/addPick.vue

@@ -8,7 +8,7 @@
     :close-on-press-escape="false"
     append-to-body
     :maxable="true"
-    width="80%"
+    width="90%"
   >
     <div>
       <el-form :model="pickForm" ref="pickForm">
@@ -57,6 +57,20 @@
                 <div class="name">批次号</div>
                 <div class="content">{{ item.batchNo }}</div>
               </div>
+              <div class="col">
+                <div class="name">型号</div>
+                <div class="content">{{ item.model }}</div>
+              </div>
+
+              <div class="col">
+                <div class="name">规格</div>
+                <div class="content">{{ item.specification }}</div>
+              </div>
+
+              <div class="col">
+                <div class="name">颜色</div>
+                <div class="content">{{ item.colorKey }}</div>
+              </div>
               <div class="col pd6">
                 <el-button
                   type="primary"

+ 1 - 1
src/views/pick/pickApply/components/selfBuildPick.vue

@@ -7,7 +7,7 @@
     :close-on-press-escape="false"
     append-to-body
     :maxable="true"
-    width="80%"
+    width="90%"
   >
     <div>
       <el-form :model="pickForm" ref="pickForm">

+ 11 - 5
src/views/produce/components/picking/index.vue

@@ -9,7 +9,7 @@
     :close-on-press-escape="false"
     id="formId"
     append-to-body
-    width="80%"
+    width="90%"
     @update:fullscreen="fullscreen"
     :fullscreen="isFullscreen"
     :height="dialogDynamicHeight"
@@ -59,14 +59,20 @@
             </div>
 
             <div class="col">
-              <div class="name">要求生产数量</div>
-              <div class="content">{{ item.formingNum }}</div>
+              <div class="name">规格</div>
+              <div class="content">{{ item.specification }}</div>
+            </div>
+
+            <div class="col">
+              <div class="name">颜色</div>
+              <div class="content">{{ item.colorKey }}</div>
             </div>
 
             <div class="col">
-              <div class="name">计量单位</div>
-              <div class="content">{{ item.unit }}</div>
+              <div class="name">要求生产数量</div>
+              <div class="content">{{ item.formingNum }}{{ item.unit }}</div>
             </div>
+
             <!-- <div class="col">
               <div class="name">批次号</div>
               <div class="content">{{ item.batchNo }}</div>

+ 2 - 2
vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
@@ -46,7 +46,7 @@ module.exports = {
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',
         // target: 'http://116.163.22.90:86/api', // 嘉实生产
-        // target: 'http://aiot.zoomwin.com.cn:51001/api',
+        target: 'http://aiot.zoomwin.com.cn:51001/api',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''