Explorar el Código

修改登录样式支持手机端登录

xiaodai2017 hace 2 años
padre
commit
9725ca13f0

+ 15 - 5
src/apis/url-config.js

@@ -1,6 +1,13 @@
-import { api, ding, webUrl } from '@/config'
-const { userApi, baseApi } = api
-const { CorpId, AgentId } = ding
+import {
+  api,
+  ding,
+  webUrl,
+  loginTitle,
+  loginBeian,
+  loginBeianUrl,
+} from "@/config";
+const { userApi, baseApi } = api;
+const { CorpId, AgentId } = ding;
 export default {
 export default {
   //后端user接口url
   //后端user接口url
   userURL: userApi,
   userURL: userApi,
@@ -11,5 +18,8 @@ export default {
   //应用凭证
   //应用凭证
   agentId: AgentId,
   agentId: AgentId,
   // tableURL: tableApi,
   // tableURL: tableApi,
-  webUrl: webUrl
-}
+  webUrl: webUrl,
+  loginTitle,
+  loginBeian,
+  loginBeianUrl,
+};

+ 3 - 0
src/config/env.development.js

@@ -22,4 +22,7 @@ module.exports = {
     //应用凭证
     //应用凭证
     AgentId: "1324690581",
     AgentId: "1324690581",
   },
   },
+  loginTitle: "万宇恒通",
+  loginBeian: "京ICP备2020033956号-1",
+  loginBeianUrl: "https://beian.miit.gov.cn/",
 };
 };

+ 3 - 0
src/config/env.jiesuan.js

@@ -16,4 +16,7 @@ module.exports = {
     //应用凭证
     //应用凭证
     AgentId: "1324690581",
     AgentId: "1324690581",
   },
   },
+  loginTitle: "",
+  loginBeian: "京ICP备2022033072号-1",
+  loginBeianUrl: "https://beian.miit.gov.cn/",
 };
 };

+ 4 - 1
src/config/env.process.js

@@ -14,5 +14,8 @@ module.exports = {
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     //应用凭证
     //应用凭证
     AgentId: "1324690581"
     AgentId: "1324690581"
-  }
+  },
+  loginTitle: "万宇恒通",
+  loginBeian: "京ICP备2020033956号-1",
+  loginBeianUrl: "https://beian.miit.gov.cn/",
 }
 }

+ 4 - 1
src/config/env.production.js

@@ -20,5 +20,8 @@ module.exports = {
     //应用凭证
     //应用凭证
     AgentId:"1324690581"
     AgentId:"1324690581"
     
     
-  }
+  },
+  loginTitle: "万宇恒通",
+  loginBeian: "京ICP备2020033956号-1",
+  loginBeianUrl: "https://beian.miit.gov.cn/",
 }
 }

+ 4 - 1
src/config/env.staging.js

@@ -15,5 +15,8 @@ module.exports = {
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     CorpId: "dingc78fa4301e1a424a35c2f4657eb6378f",
     //应用凭证
     //应用凭证
     AgentId: "1324690581"
     AgentId: "1324690581"
-  }
+  },
+  loginTitle: "万宇恒通",
+  loginBeian: "京ICP备2020033956号-1",
+  loginBeianUrl: "https://beian.miit.gov.cn/",
 }
 }

+ 213 - 72
src/views/login/index.vue

@@ -1,10 +1,15 @@
 <template>
 <template>
   <div class="login-container">
   <div class="login-container">
+    <div class="login-bg">
+      <img src="@/assets/sheji/loginbg.png" alt="" />
+    </div>
     <div class="login-form-main">
     <div class="login-form-main">
-      <img src="@/assets/sheji/loginlan.png" alt="" />
-      <div class="main-title">
-        <h1>欢迎登录</h1>
-        <h3>采销平台供应商端</h3>
+      <div class="login-form-main-left">
+        <img src="@/assets/sheji/loginlan.png" alt="" />
+        <div class="main-title">
+          <h1>欢迎登录</h1>
+          <h3>采销平台供应商端</h3>
+        </div>
       </div>
       </div>
       <el-form
       <el-form
         ref="loginForm"
         ref="loginForm"
@@ -75,7 +80,7 @@
           >登&nbsp;&nbsp;&nbsp;&nbsp;录</el-button
           >登&nbsp;&nbsp;&nbsp;&nbsp;录</el-button
         >
         >
 
 
-        <div style="position: relative; padding: 12px 0 0 0">
+        <!-- <div style="position: relative; padding: 12px 0 0 0">
           <div class="tips" style="float: left">
           <div class="tips" style="float: left">
             <el-popover
             <el-popover
               placement="top"
               placement="top"
@@ -86,18 +91,18 @@
             >
             >
               <i class="el-icon-info" slot="reference"></i>
               <i class="el-icon-info" slot="reference"></i>
             </el-popover>
             </el-popover>
-          </div>
-          <!-- <router-link to="/forget-password">
+          </div> -->
+        <!-- <router-link to="/forget-password">
             <div class="tips" style="float: right">
             <div class="tips" style="float: right">
               <span>忘记密码</span>
               <span>忘记密码</span>
             </div>
             </div>
           </router-link> -->
           </router-link> -->
-        </div>
+        <!-- </div> -->
       </el-form>
       </el-form>
     </div>
     </div>
-    <div class="beian">
-      <span>万宇恒通</span>
-      <a target="_blank" href="https://beian.miit.gov.cn/">京ICP备2020033956号-1</a>
+    <div class="beian" v-if="loginBeian !== ''">
+      <span>{{ loginTitle }}</span>
+      <a target="_blank" :href="loginBeianUrl">{{ loginBeian }}</a>
       <span> </span>
       <span> </span>
     </div>
     </div>
   </div>
   </div>
@@ -106,6 +111,7 @@
 <script>
 <script>
 import resToken from "@/mixins/resToken";
 import resToken from "@/mixins/resToken";
 import { isnumber, isAlphanumeric, validAlphabets, isMobile } from "@/utils/validate";
 import { isnumber, isAlphanumeric, validAlphabets, isMobile } from "@/utils/validate";
+import urlConfig from "@/apis/url-config";
 export default {
 export default {
   name: "Login",
   name: "Login",
   mixins: [resToken],
   mixins: [resToken],
@@ -141,6 +147,9 @@ export default {
     return {
     return {
       ver: "",
       ver: "",
       show: false,
       show: false,
+      loginTitle: urlConfig.loginTitle,
+      loginBeian: urlConfig.loginBeian,
+      loginBeianUrl: urlConfig.loginBeianUrl,
       loginForm: {
       loginForm: {
         mobile: "",
         mobile: "",
         password: "",
         password: "",
@@ -329,73 +338,210 @@ $light_gray: #f2f2f2;
   left: 0;
   left: 0;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
-  min-width: 1000px;
-  min-height: 700px;
   z-index: 2;
   z-index: 2;
   zoom: 1;
   zoom: 1;
-  background-repeat: no-repeat;
-  background-size: cover;
-  background-position: center 0;
-  background-image: url("~@/assets/sheji/loginbg.png");
   text-align: center;
   text-align: center;
-  .login-form-main {
-    display: inline-block;
-    width: 600px;
-    height: 500px;
-    margin: 26vh auto 0 auto;
-    position: relative;
-    img {
-      width: 400px;
-      height: 350px;
+  // background-repeat: no-repeat;
+  // background-size: cover;
+  // background-position: center 0;
+  // background-image: url("~@/assets/sheji/loginbg.png");
+  // text-align: center;
+  @media screen and (min-width: 0px) {
+    .login-bg {
+      display: none;
     }
     }
-    .main-title {
+    .login-form-main {
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+      margin: 12vh auto 0 auto;
+      position: relative;
+      text-align: left;
+      .login-form-main-left {
+        display: none;
+        text-align: center;
+        // img {
+        //   width: 400px;
+        //   height: 350px;
+        // }
+        .main-title {
+          display: none;
+        }
+      }
+
+      .login-form {
+        width: 320px;
+        max-width: 100%;
+        padding: 60px 28px 40px 28px;
+        margin: 0 auto;
+        overflow: hidden;
+        background: #fff;
+        border-radius: 20px;
+        .el-button--primary {
+          background-color: #38c1e7;
+          border-color: #38c1e7;
+          height: 46px;
+          font-size: 16px;
+          text-align: center;
+        }
+      }
+    }
+    .beian {
+      padding: 0 0 0 0;
+    }
+  }
+  @media screen and (min-width: 768px) {
+    .login-bg {
       position: absolute;
       position: absolute;
       top: 0;
       top: 0;
       left: 0;
       left: 0;
-      z-index: 2;
-      left: 170px;
-      top: 125px;
+      min-width: 1000px;
+      min-height: 700px;
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+    }
+    .login-form-main {
+      display: inline-block;
+      width: 600px;
+      height: 500px;
+      margin: 26vh auto 0 auto;
+      position: relative;
       text-align: left;
       text-align: left;
-      color: #fff;
-      h1 {
-        padding: 0 0 13px 0;
+      .login-form-main-left {
+        display: block;
+        text-align: left;
+        img {
+          width: 400px;
+          height: 350px;
+        }
+        .main-title {
+          display: block;
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 2;
+          left: 80px;
+          top: 125px;
+          text-align: left;
+          color: #fff;
+          h1 {
+            padding: 0 0 13px 0;
+          }
+          h3 {
+            font-size: 22px;
+          }
+        }
       }
       }
-      h3 {
-        font-size: 22px;
+
+      .login-form {
+        position: absolute;
+        width: 320px;
+        top: -20px;
+        left: 260px;
+        z-index: 3;
+        max-width: 100%;
+        padding: 60px 28px 40px 28px;
+        margin: 0 auto;
+        overflow: hidden;
+        background: #fff;
+        border-radius: 20px;
+        .el-button--primary {
+          background-color: #38c1e7;
+          border-color: #38c1e7;
+          height: 46px;
+          font-size: 16px;
+          text-align: center;
+        }
       }
       }
     }
     }
-    .login-form {
+    .beian {
+      padding: 0 0 0 15%;
+    }
+  }
+
+  @media screen and (min-width: 1200px) {
+    .login-bg {
       position: absolute;
       position: absolute;
-      width: 320px;
-      top: -20px;
-      left: 380px;
-      z-index: 3;
-      max-width: 100%;
-      padding: 60px 28px 20px 28px;
-      margin: 0 auto;
-      overflow: hidden;
-      background: #fff;
-      border-radius: 20px;
-      .el-button--primary {
-        background-color: #38c1e7;
-        border-color: #38c1e7;
-        height: 46px;
-        font-size: 16px;
+      top: 0;
+      left: 0;
+      min-width: 1000px;
+      min-height: 700px;
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+    }
+    .login-form-main {
+      display: inline-block;
+      width: 600px;
+      height: 500px;
+      margin: 26vh auto 0 auto;
+      position: relative;
+      text-align: left;
+      .login-form-main-left {
+        display: block;
         text-align: center;
         text-align: center;
+        img {
+          width: 400px;
+          height: 350px;
+        }
+        .main-title {
+          display: block;
+          position: absolute;
+          top: 0;
+          left: 0;
+          z-index: 2;
+          left: 170px;
+          top: 125px;
+          text-align: left;
+          color: #fff;
+          h1 {
+            padding: 0 0 13px 0;
+          }
+          h3 {
+            font-size: 22px;
+          }
+        }
       }
       }
+
+      .login-form {
+        position: absolute;
+        width: 320px;
+        top: -20px;
+        left: 380px;
+        z-index: 3;
+        max-width: 100%;
+        padding: 60px 28px 40px 28px;
+        margin: 0 auto;
+        overflow: hidden;
+        background: #fff;
+        border-radius: 20px;
+        .el-button--primary {
+          background-color: #38c1e7;
+          border-color: #38c1e7;
+          height: 46px;
+          font-size: 16px;
+          text-align: center;
+        }
+      }
+    }
+    .beian {
+      padding: 0 0 0 15%;
     }
     }
   }
   }
+
   // min-height: 100%;
   // min-height: 100%;
   // width: 100%;
   // width: 100%;
   // background-color: $bg;
   // background-color: $bg;
   // overflow: hidden;
   // overflow: hidden;
+  //版本
   .beian {
   .beian {
     position: absolute;
     position: absolute;
     width: 100%;
     width: 100%;
     bottom: 60px;
     bottom: 60px;
     color: #343434;
     color: #343434;
     font-size: 12px;
     font-size: 12px;
-    padding: 0 0 0 15%;
+
     span {
     span {
       padding: 0 10px;
       padding: 0 10px;
     }
     }
@@ -410,21 +556,22 @@ $light_gray: #f2f2f2;
       }
       }
     }
     }
   }
   }
-  .tips {
-    font-size: 14px;
-    color: #04a2ce;
-    margin-bottom: 10px;
+  //忘记密码提示
+  // .tips {
+  //   font-size: 14px;
+  //   color: #04a2ce;
+  //   margin-bottom: 10px;
 
 
-    span {
-      &:first-of-type {
-        margin-right: 8px;
-      }
-    }
-    i {
-      font-size: 20px;
-      margin: 0 0 0 7px;
-    }
-  }
+  //   span {
+  //     &:first-of-type {
+  //       margin-right: 8px;
+  //     }
+  //   }
+  //   i {
+  //     font-size: 20px;
+  //     margin: 0 0 0 7px;
+  //   }
+  // }
   .puzzle-box {
   .puzzle-box {
     position: absolute;
     position: absolute;
     top: 200px;
     top: 200px;
@@ -471,11 +618,5 @@ $light_gray: #f2f2f2;
     right: 0;
     right: 0;
     bottom: 6px;
     bottom: 6px;
   }
   }
-
-  @media only screen and (max-width: 470px) {
-    .thirdparty-button {
-      display: none;
-    }
-  }
 }
 }
 </style>
 </style>

+ 167 - 174
src/views/report/cpns/baseDetail.vue

@@ -1,179 +1,177 @@
 <template>
 <template>
   <div class="filingDetail">
   <div class="filingDetail">
     <div class="filingDetail-main">
     <div class="filingDetail-main">
-          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
-            <el-collapse-item :title="'报备单详情'" name="1">
-              <show-data-table
-                style="padding: -5px 0 10px 0"
-                :newTime="newTime"
-                v-if="newTime !== ''"
-                :sitem="sitem"
-                :columns="editColumns"
-              >
-                <template slot="status">
-                  <el-tag
-                    :size="tablebtnSize"
-                    :type="
-                      (statusOptions.find((item) => item.value == sitem.status) || {}).type ||
-                      ''
-                    "
-                    v-text="
-                      (statusOptions.find((item) => item.value == sitem.status) || {}).label ||
-                      '--'
-                    "
-                  ></el-tag>
-                </template>
+      <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+        <el-collapse-item :title="'报备单详情'" name="1">
+          <show-data-table
+            style="padding: -5px 0 10px 0"
+            :newTime="newTime"
+            v-if="newTime !== ''"
+            :sitem="sitem"
+            :columns="editColumns"
+          >
+            <template slot="status">
+              <el-tag
+                :size="tablebtnSize"
+                :type="
+                  (statusOptions.find((item) => item.value == sitem.status) || {}).type ||
+                  ''
+                "
+                v-text="
+                  (statusOptions.find((item) => item.value == sitem.status) || {})
+                    .label || '--'
+                "
+              ></el-tag>
+            </template>
 
 
-                <template slot="expect_service_proportion">
-                  <span>{{sitem.expect_service_proportion}}%</span>
-                </template>
+            <template slot="expect_service_proportion">
+              <span>{{ sitem.expect_service_proportion }}%</span>
+            </template>
 
 
-                <template slot="service_proportion">
-                  <span>{{sitem.service_proportion}}%</span>
-                </template>
+            <template slot="service_proportion">
+              <span>{{ sitem.service_proportion }}%</span>
+            </template>
 
 
-                <template slot="supplierName">
-                  <span>{{ sitem.supplierName }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
-                    <ul>
-                      <li>
-                        <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
-                      </li>
-                    </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
-                  </el-popover>
-                </template>
-                <template slot="customerName">
-                  <span>{{ sitem.customerName }}</span>
-                  <el-popover placement="top" width="300" trigger="hover">
-                    <ul>
-                      <li>
-                        <span>业务公司编号:</span><span>{{ sitem.customerNo }}</span>
-                      </li>
-                    </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
-                  </el-popover>
-                </template>
-                <template slot="companyName">
-                  <span>{{ sitem.companyName }}</span>
-                  <el-popover
-                    placement="top"
-                    width="300"
-                    trigger="hover"
-                    v-if="sitem.companyCode"
-                  >
-                    <ul>
-                      <li>
-                        <span>企业客户编号:</span><span>{{ sitem.companyCode }}</span>
-                      </li>
-                    </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
-                  </el-popover>
-                </template>
+            <template slot="supplierName">
+              <span>{{ sitem.supplierName }}</span>
+              <el-popover placement="top" width="300" trigger="hover">
+                <ul>
+                  <li>
+                    <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
+                  </li>
+                </ul>
+                <i class="el-icon-warning-outline fr" slot="reference"></i>
+              </el-popover>
+            </template>
+            <template slot="customerName">
+              <span>{{ sitem.customerName }}</span>
+              <el-popover placement="top" width="300" trigger="hover">
+                <ul>
+                  <li>
+                    <span>业务公司编号:</span><span>{{ sitem.customerNo }}</span>
+                  </li>
+                </ul>
+                <i class="el-icon-warning-outline fr" slot="reference"></i>
+              </el-popover>
+            </template>
+            <template slot="companyName">
+              <span>{{ sitem.companyName }}</span>
+              <el-popover
+                placement="top"
+                width="300"
+                trigger="hover"
+                v-if="sitem.companyCode"
+              >
+                <ul>
+                  <li>
+                    <span>企业客户编号:</span><span>{{ sitem.companyCode }}</span>
+                  </li>
+                </ul>
+                <i class="el-icon-warning-outline fr" slot="reference"></i>
+              </el-popover>
+            </template>
 
 
-                <template slot="is_determine_price">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (
-                        is_determine_price_options.find(
-                          (item) => item.id == sitem.is_determine_price + ''
-                        ) || {}
-                      ).label || '--'
-                    "
-                  ></el-tag>
-                </template>
-              </show-data-table>
-            </el-collapse-item>
-            <el-collapse-item title="商品信息" name="20">
-              <show-data-table
-                :newTime="newTime"
-                v-if="newTime !== ''"
-                :columns="coveColumns"
-                :sitem="sitem"
+            <template slot="is_determine_price">
+              <el-tag
+                :size="'mini'"
+                v-text="
+                  (
+                    is_determine_price_options.find(
+                      (item) => item.id == sitem.is_determine_price + ''
+                    ) || {}
+                  ).label || '--'
+                "
+              ></el-tag>
+            </template>
+          </show-data-table>
+        </el-collapse-item>
+        <el-collapse-item title="商品信息" name="20">
+          <show-data-table
+            :newTime="newTime"
+            v-if="newTime !== ''"
+            :columns="coveColumns"
+            :sitem="sitem"
+          >
+            <template slot="good_name">
+              <span>{{ sitem.good_name }}</span>
+              <span v-for="(si, i) in sitem.specinfo" :key="si.spec_id + i">
+                <span v-if="i !== 0">-</span>
+                <span v-else>_</span>
+                <span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
+              </span>
+              <el-popover
+                v-if="sitem.spuCode"
+                placement="top"
+                width="300"
+                trigger="hover"
               >
               >
-                <template slot="good_name">
-                  <span>{{ sitem.good_name }}</span>
-                  <span v-for="(si, i) in sitem.specinfo" :key="si.spec_id + i">
-                    <span v-if="i !== 0">-</span>
-                    <span v-else>_</span>
-                    <span>{{ si.spec_name }}[{{ si.spec_value_name }}]</span>
-                  </span>
-                  <el-popover
-                    v-if="sitem.spuCode"
-                    placement="top"
-                    width="300"
-                    trigger="hover"
-                  >
-                    <ul>
-                      <li>
-                        <span>商品编号:</span><span>{{ sitem.spuCode }}</span>
-                      </li>
-                    </ul>
-                    <i class="el-icon-warning-outline fr" slot="reference"></i>
-                  </el-popover>
-                </template>
+                <ul>
+                  <li>
+                    <span>商品编号:</span><span>{{ sitem.spuCode }}</span>
+                  </li>
+                </ul>
+                <i class="el-icon-warning-outline fr" slot="reference"></i>
+              </el-popover>
+            </template>
 
 
-                <template slot="send_way">
-                  <span>{{ sitem.send_way === "1" ? "供应商包邮" : "公司自提" }}</span>
-                </template>
+            <template slot="send_way">
+              <span>{{ sitem.send_way === "1" ? "供应商包邮" : "公司自提" }}</span>
+            </template>
 
 
-                <template slot="good_type">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (options1.find((item) => item.id == sitem.good_type) || {}).name ||
-                      '--'
-                    "
-                  />
-                  <span v-if="sitem.good_type === '1'" style="padding: 0 0 0 5px"
-                    >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
-                  >
-                </template>
-                <template slot="supply_area">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (options6.find((item) => item.id === sitem.supply_area) || {})
-                        .name || '--'
-                    "
-                  ></el-tag>
-                </template>
+            <template slot="good_type">
+              <el-tag
+                :size="'mini'"
+                v-text="
+                  (options1.find((item) => item.id == sitem.good_type) || {}).name || '--'
+                "
+              />
+              <span v-if="sitem.good_type === '1'" style="padding: 0 0 0 5px"
+                >{{ sitem.moq }}起订/工期{{ sitem.customized }}天</span
+              >
+            </template>
+            <template slot="supply_area">
+              <el-tag
+                :size="'mini'"
+                v-text="
+                  (options6.find((item) => item.id === sitem.supply_area) || {}).name ||
+                  '--'
+                "
+              ></el-tag>
+            </template>
 
 
-                <template slot="pay_way">
-                  <el-tag
-                    :size="'mini'"
-                    v-text="
-                      (options13.find((item) => item.id == sitem.pay_way) || {}).name ||
-                      '--'
-                    "
-                  />
-                </template>
-                <template slot="noble">
-                  <span v-if="sitem.noble_name"
-                    >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
-                      sitem.noble_name
-                    }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
-                      sitem.is_gold_price === "0" ? "不" : ""
-                    }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
-                      sitem.config
-                    }}-{{ sitem.other_config }}</span
-                  >
-                  <span v-else>--</span>
-                </template>
-                <template slot="good_img">
-                  <img
-                    v-viewer
-                    style="width: 23px; height: 23px; margin: 0 5px 0 0"
-                    class="fl"
-                    v-for="(si, sii) in sitem.good_img"
-                    :key="si + sii"
-                    :src="si"
-                    alt=""
-                  /> </template
-              ></show-data-table>
-            </el-collapse-item>
-          </el-collapse>
+            <template slot="pay_way">
+              <el-tag
+                :size="'mini'"
+                v-text="
+                  (options13.find((item) => item.id == sitem.pay_way) || {}).name || '--'
+                "
+              />
+            </template>
+            <template slot="noble">
+              <span v-if="sitem.noble_name"
+                >{{ sitem.noble_weight ? sitem.noble_weight : "0" }}g-{{
+                  sitem.noble_name
+                }}-{{ sitem.gold_price ? sitem.gold_price : "0" }}元/g-{{
+                  sitem.is_gold_price === "0" ? "不" : ""
+                }}启用实时金价-{{ sitem.is_diff === "1" ? "有" : "无" }}工差-{{
+                  sitem.config
+                }}-{{ sitem.other_config }}</span
+              >
+              <span v-else>--</span>
+            </template>
+            <template slot="good_img">
+              <img
+                v-viewer
+                style="width: 23px; height: 23px; margin: 0 5px 0 0"
+                class="fl"
+                v-for="(si, sii) in sitem.good_img"
+                :key="si + sii"
+                :src="si"
+                alt=""
+              /> </template
+          ></show-data-table>
+        </el-collapse-item>
+      </el-collapse>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>
@@ -182,7 +180,6 @@ import asyncRequest from "@/apis/report";
 import resToken from "@/mixins/resToken";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import { mapGetters } from "vuex";
 
 
-
 import {
 import {
   editColumns,
   editColumns,
   costArr,
   costArr,
@@ -198,10 +195,8 @@ import {
   options9,
   options9,
   options10,
   options10,
   options11,
   options11,
-  options12,
   options13,
   options13,
   statusOptions,
   statusOptions,
-  rate_status_options,
   coveColumns,
   coveColumns,
   is_determine_price_options,
   is_determine_price_options,
 } from "../config/columns";
 } from "../config/columns";
@@ -231,10 +226,8 @@ export default {
       options9,
       options9,
       options10,
       options10,
       options11,
       options11,
-      options12,
       options13,
       options13,
       statusOptions,
       statusOptions,
-      rate_status_options,
       is_determine_price_options,
       is_determine_price_options,
       coveColumns,
       coveColumns,
       projectTabs: "1",
       projectTabs: "1",
@@ -290,12 +283,12 @@ export default {
           });
           });
         }
         }
         this.sitem.cat = cat;
         this.sitem.cat = cat;
-        const { status,num ,orderCode} = this.sitem;
+        const { status, num, orderCode } = this.sitem;
         this.status = status;
         this.status = status;
 
 
-        this.$emit('change-status',status);
-        this.$emit('change-num', num);
-        this.$emit('change-order-code', orderCode);
+        this.$emit("change-status", status);
+        this.$emit("change-num", num);
+        this.$emit("change-order-code", orderCode);
         this.getNewTime();
         this.getNewTime();
       } else if (code >= 100 && code <= 104) {
       } else if (code >= 100 && code <= 104) {
         await this.logout();
         await this.logout();

+ 32 - 21
src/views/report/cpns/shipment-request.vue

@@ -1,49 +1,60 @@
 <template>
 <template>
   <el-table size="mini" border :data="list" max-height="300px" v-loading="loading">
   <el-table size="mini" border :data="list" max-height="300px" v-loading="loading">
-    <el-table-column label="发货申请编号" width="160px" prop="orderCode" show-overflow-tooltip />
+    <el-table-column
+      label="发货申请编号"
+      width="160px"
+      prop="orderCode"
+      show-overflow-tooltip
+    />
     <el-table-column label="状态" width="120px" prop="status" show-overflow-tooltip>
     <el-table-column label="状态" width="120px" prop="status" show-overflow-tooltip>
-      <template #default="scope">
-        <el-tag>{{statusOptions.find(({value}) => value === String(scope.row.status))?.label}}</el-tag>
+      <template #status="{ scope }">
+        <el-tag>{{
+          (statusOptions.find(({ value }) => value === scope.row.status) || {}).label ||
+          "--"
+        }}</el-tag>
       </template>
       </template>
     </el-table-column>
     </el-table-column>
-    <el-table-column label="发货数量" width="80px"  prop="send_num" show-overflow-tooltip />
+    <el-table-column
+      label="发货数量"
+      width="80px"
+      prop="send_num"
+      show-overflow-tooltip
+    />
     <el-table-column width="90px" label="联系人" prop="contactor" show-overflow-tooltip />
     <el-table-column width="90px" label="联系人" prop="contactor" show-overflow-tooltip />
     <el-table-column width="120px" label="联系电话" prop="mobile" show-overflow-tooltip />
     <el-table-column width="120px" label="联系电话" prop="mobile" show-overflow-tooltip />
     <el-table-column label="收货地址" prop="addr" show-overflow-tooltip />
     <el-table-column label="收货地址" prop="addr" show-overflow-tooltip />
     <el-table-column label="物流公司" prop="post_name" show-overflow-tooltip />
     <el-table-column label="物流公司" prop="post_name" show-overflow-tooltip />
-    <el-table-column label="物流单号" prop="post_code" show-overflow-tooltip/>
+    <el-table-column label="物流单号" prop="post_code" show-overflow-tooltip />
     <el-table-column label="发货时间" prop="updatetime" show-overflow-tooltip />
     <el-table-column label="发货时间" prop="updatetime" show-overflow-tooltip />
   </el-table>
   </el-table>
 </template>
 </template>
 
 
-
 <script>
 <script>
 import asyncRequest from "@/apis/report";
 import asyncRequest from "@/apis/report";
-import { statusOptions } from "./../config/columns";
 export default {
 export default {
-  props:["orderCode"],
-  data(){
+  props: ["orderCode"],
+  data() {
     return {
     return {
-      list:[],
-      loading:false,
-      statusOptions:[
+      list: [],
+      loading: false,
+      statusOptions: [
         { value: "0", label: "待发货" },
         { value: "0", label: "待发货" },
         { value: "1", label: "待库管发货" },
         { value: "1", label: "待库管发货" },
         { value: "2", label: "已发货待收货" },
         { value: "2", label: "已发货待收货" },
         { value: "3", label: "已收货" },
         { value: "3", label: "已收货" },
-        { value: "4", label: "已全部退货" }
-      ]
-    }
+        { value: "4", label: "已全部退货" },
+      ],
+    };
   },
   },
-  async mounted(){
+  async mounted() {
     const orderCode = this.orderCode;
     const orderCode = this.orderCode;
-    if(!orderCode) return
+    if (!orderCode) return;
     this.loading = true;
     this.loading = true;
-    const { data, code, message } = await asyncRequest.saleOutList({ orderCode })
+    const { data, code, message } = await asyncRequest.saleOutList({ orderCode });
     this.loading = false;
     this.loading = false;
-    if(Number(code) === 0){
+    if (Number(code) === 0) {
       this.list = data.list;
       this.list = data.list;
     }
     }
-  }
-}
+  },
+};
 </script>
 </script>