695593266@qq.com пре 6 месеци
родитељ
комит
ab7eaf1ea5
3 измењених фајлова са 38 додато и 3 уклоњено
  1. 32 2
      src/views/produce/components/picking/detailed.vue
  2. 4 0
      src/views/warehousing/index.vue
  3. 2 1
      vue.config.js

+ 32 - 2
src/views/produce/components/picking/detailed.vue

@@ -19,7 +19,7 @@
       :close-on-press-escape="false"
       id="formId"
       append-to-body
-      width="80%"
+      width="90%"
       @update:fullscreen="fullscreen"
       :fullscreen="isFullscreen"
       :height="dialogDynamicHeight"
@@ -40,6 +40,36 @@
             <div class="content">{{ dataObj.executorName }}</div>
           </div>
 
+          <div class="col">
+            <div class="name">编码</div>
+            <div class="content">{{ dataObj.categoryCode }}</div>
+          </div>
+
+          <div class="col">
+            <div class="name">名称</div>
+            <div class="content">{{ dataObj.categoryName }}</div>
+          </div>
+
+          <div class="col">
+            <div class="name">规格</div>
+            <div class="content">{{ dataObj.specification }}</div>
+          </div>
+
+          <div class="col">
+            <div class="name">型号</div>
+            <div class="content">{{ dataObj.modelType }}</div>
+          </div>
+
+          <div class="col">
+            <div class="name">颜色</div>
+            <div class="content">{{ dataObj.colorKey }}</div>
+          </div>
+
+          <div class="col">
+            <div class="name">单位</div>
+            <div class="content">{{ dataObj.unit }}</div>
+          </div>
+
           <div class="col">
             <div class="name">类型</div>
             <div class="content" v-if="dataObj.type == 1">自建领料</div>
@@ -478,7 +508,7 @@
       width: calc(100% / 5);
       display: flex;
       align-items: center;
-      min-width: 200px;
+      // min-width: 200px;
       min-height: 32px;
       border-bottom: 1px solid #e3e5e5;
       border-right: 1px solid #e3e5e5;

+ 4 - 0
src/views/warehousing/index.vue

@@ -58,6 +58,10 @@
           >
             流程
           </el-link>
+
+          <!-- <el-link type="primary" :underline="false" @click="sendGoods(row)">
+            发货
+          </el-link> -->
           <!-- <el-link type="primary" :underline="false" @click="details(row)">
             详情
           </el-link> -->

+ 2 - 1
vue.config.js

@@ -46,7 +46,8 @@ 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',
+        target: 'http://f222326r53.imwork.net',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''