build

src/apis/user/axios.js

@@ -63,6 +63,14 @@ export default async(
       config.data.relaComNo = isAllowRelaComNo ? innerRelaComNo : ''
 
       if (needRela) config.data.relaComNo = relaComNo || innerRelaComNo
+
+      // if ('noRelation' in config.data) {
+      //   delete config.data['noRelation']
+      // }
+      // if ('needRela' in config.data) {
+      //   delete config.data['needRela']
+      // }
+
       return config
     },
     () => {

src/components/globalComponents/search-stock/main.vue

@@ -21,7 +21,10 @@
       :label="item.name"
       :value="item.wsm_code"
       :disabled="item.status + '' === '0'"
-    />
+    >
+      <span style="float: left">{{ item.name }}</span>
+      <span style="float: right; color: #8492a6; font-size: 13px">{{ (wsm_options.find(({value}) => String(value) === String(item.wsm_type)) || {}).label || '--' }}</span>
+    </el-option>
   </el-select>
 </template>
 
@@ -64,6 +67,28 @@ export default {
       options: [],
       selectLoading: false,
       searchName: '',
+      wsm_options: [
+        // {
+        //   value: "1",
+        //   label: "系统仓",
+        // },
+        //   {
+        //   value: "2",
+        //   label: "虚拟仓",
+        // },
+        //     {
+        //   value: "3",
+        //   label: "自建仓",
+        // },
+        {
+          value: '5',
+          label: '销售仓'
+        },
+        {
+          value: '4',
+          label: '次品仓'
+        }
+      ],
       formValue: {
         page: 1,
         size: 100,

src/views/login/index.vue

@@ -402,7 +402,7 @@ $light_gray: #f2f2f2;
     display: inline-block;
     width: 600px;
     height: 500px;
-    margin: 26vh auto 0 auto;
+    margin: 23vh auto 0 auto;
     position: relative;
     img {
       width: 400px;