build

src/layout/components/Sidebar/Item.vue

@@ -1,36 +1,36 @@
 <script>
 export default {
-  name: "MenuItem",
+  name: 'MenuItem',
   functional: true,
   props: {
     icon: {
       type: String,
-      default: "",
+      default: ''
     },
     title: {
       type: String,
-      default: "",
-    },
+      default: ''
+    }
   },
   render(h, context) {
-    const { icon, title } = context.props;
-    const vnodes = [];
+    const { icon, title } = context.props
+    const vnodes = []
     // console.log(icon, title);
-      vnodes.push(<i class={[icon, "sub-el-icon"]} />);
+    vnodes.push(<i class={[icon, 'sub-el-icon']} />)
     // if (icon) {
     //   if (icon.includes("el-icon")) {
-      
+
     //   } else {
     //     vnodes.push(<svg-icon icon-class={icon} />);
     //   }
     // }
 
     if (title) {
-      vnodes.push(<span slot="title">{title}</span>);
+      vnodes.push(<span slot='title'>{title}</span>)
     }
-    return vnodes;
-  },
-};
+    return vnodes
+  }
+}
 </script>
 
 <style scoped>

src/styles/element-variables.scss

@@ -1,3 +1,71 @@
+// /**
+// * I think element-ui's default theme color is too light for long-term use.
+// * So I modified the default color and you can modify it to your liking.
+// **/
+
+// // /* theme color */
+// // // #1890ff
+// // $--color-primary: #6954f0;
+// // //#13ce66
+// // $--color-success: #13ce66;
+// // // #ffba00
+// // $--color-warning: #FFB65D;
+// // // #ff4949
+// // $--color-danger: #ff4d4f;
+// // $--color-info: #C9CDD4;
+
+// // $--button-font-weight: 400;
+
+// $--border-radius: 2.5px;
+// $--left-menu-width: 266px;
+// $--color-transition: #1890ff;
+// $--border-radius-base: 2.5px;
+// $--color-info-lighter: #f4f4f5;
+// $--color-info-light: #e9e9eb;
+// $--color-error-lighter: #ffeded;
+// $--color-error-light: #ffdbdc;
+// $--color-error: #ff4d4f;
+// $--color-danger-lighter: #ffeded;
+// $--color-danger-light: #ffdbdc;
+// $--color-danger: #ff4d4f;
+// $--color-warning-lighter: #fff8e6;
+// $--color-warning-light: #fff1cc;
+// $--color-warning: #ffba00;
+// $--color-success-lighter: #e7faf0;
+// $--color-success-light: #d0f5e0;
+// $--color-success: #13ce66;
+// $--color-primary-light-9: #f0eefe;
+// $--color-primary-light-8: #e1ddfc;
+// $--color-primary-light-7: #d2ccfb;
+// $--color-primary-light-6: #c3bbf9;
+// $--color-primary-light-5: #b4aaf8;
+// $--color-primary-light-4: #a598f6;
+// $--color-primary-light-3: #9687f5;
+// $--color-primary-light-2: #8776f3;
+// $--color-primary-light-1: #7865f2;
+// $--color-primary: #6954f0;
+// $--color-black: #515a6e;
+// $--color-grey: rgba(0, 0, 0, 0.65);
+
+// // $--color-text-regular: #1f2d3d;
+
+// $--border-color-light: #dfe4ed;
+// $--border-color-lighter: #e6ebf5;
+
+// $--table-border: 1px solid #dfe6ec;
+
+// /* icon font path, required */
+// $--font-path: "~element-ui/lib/theme-chalk/fonts";
+
+// @import "~element-ui/packages/theme-chalk/src/index";
+
+// // the :export directive is the magic sauce for webpack
+// // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+// :export {
+//   theme: $--color-primary;
+// }
+
+
 /**
 * I think element-ui's default theme color is too light for long-term use.
 * So I modified the default color and you can modify it to your liking.
@@ -43,10 +111,14 @@ $--color-primary-light-4: #a598f6;
 $--color-primary-light-3: #9687f5;
 $--color-primary-light-2: #8776f3;
 $--color-primary-light-1: #7865f2;
-$--color-primary: #6954f0;
+$--color-primary: #409EFF;
 $--color-black: #515a6e;
 $--color-grey: rgba(0, 0, 0, 0.65);
 
+#app .sidebar-container{
+  background-color: #00152a !important;
+}
+
 // $--color-text-regular: #1f2d3d;
 
 $--border-color-light: #dfe4ed;

src/styles/variables.scss

@@ -1,3 +1,40 @@
+// // base color
+// $blue:#324157;
+// $light-blue:#3A71A8;
+// $red:#C03639;
+// $pink: #E65D6E;
+// $green: #30B08F;
+// $tiffany: #4AB7BD;
+// $yellow:#FEC171;
+// $panGreen: #30B08F;
+
+// // sidebar
+// $menuText:#bfcbd9;
+// $menuActiveText:#409EFF;
+// $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+
+// $menuBg:#304156;
+// $menuHover:#263445;
+
+// $subMenuBg:#1f2d3d;
+// $subMenuHover:#001528;
+
+// $sideBarWidth: 210px;
+
+// // the :export directive is the magic sauce for webpack
+// // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+// :export {
+//   menuText: $menuText;
+//   menuActiveText: $menuActiveText;
+//   subMenuActiveText: $subMenuActiveText;
+//   menuBg: $menuBg;
+//   menuHover: $menuHover;
+//   subMenuBg: $subMenuBg;
+//   subMenuHover: $subMenuHover;
+//   sideBarWidth: $sideBarWidth;
+// }
+
+
 // base color
 $blue:#324157;
 $light-blue:#3A71A8;
@@ -13,10 +50,10 @@ $menuText:#bfcbd9;
 $menuActiveText:#409EFF;
 $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156;
+$menuBg:#00152a;
 $menuHover:#263445;
 
-$subMenuBg:#1f2d3d;
+$subMenuBg:#0f0606;
 $subMenuHover:#001528;
 
 $sideBarWidth: 210px;

src/views/sellOut/deliveryWorkOrder/detail.vue

@@ -141,7 +141,7 @@ export default {
         { value: "2", label: "发货完成" },
         // { value: "3", label: "已收货" },
         // { value: "4", label: "已全部收货" },
-        { value: "5", label: "已取消" },
+        { value: "5", label: "已取消"}
       ],
       xs_order_type_options,
       sitem: null, //传给组件
@@ -176,7 +176,6 @@ export default {
     canSend(){
       const { id:userId } = this.userInfo || {};
       const { contactor:manangerUserId } = this.sitem || {};
-      console.log(userId,manangerUserId)
       if(!userId || !manangerUserId) return false
       return userId === manangerUserId
     },

src/views/sellOut/deliveryWorkOrder/index.vue

@@ -461,7 +461,7 @@ export default {
     handleExport() {
       if (!this.loading) {
         this.loading = true;
-        let httpType = `aplication/zip`;
+        let httpType = `application/zip`;
         let model = JSON.parse(JSON.stringify(this.parmValue));
         delete model["s_input"];
 

src/views/sellOut/sellAfterApply/detail.vue

@@ -191,7 +191,7 @@
               <approval-results :sitem="sitem" @changeStatus="handlePurchaseConfirm" />
             </el-collapse-item>
 
-            <el-collapse-item name="5" title="供应商审核"  v-if="isHasPermission({status:'9', process:'9'}) && sitem.has_account === '1'">
+            <el-collapse-item name="5" title="供应商审核"  v-if="isHasPermission({status:'9', process:'9'}) && String(sitem.has_account) === '0'">
               <supplier-exam :sitem="sitem" @changeStatus="handleSupplierExam" />
             </el-collapse-item>
 
@@ -199,7 +199,7 @@
               <wait-return :sitem="sitem" @changeStatus="handleExpress" />
             </el-collapse-item>
 
-            <el-collapse-item name="7" title="业务公司修改，待供应商确认"  v-if="isHasPermission({status:'10', process:'10'}) && sitem.has_account === '1'">
+            <el-collapse-item name="7" title="业务公司修改，待供应商确认"  v-if="isHasPermission({status:'10', process:'10'}) && String(sitem.has_account) === '0'">
               <supplier-confrim :sitem="sitem"  @changeStatus="handleSupplierConfirm"/>
             </el-collapse-item>
 
@@ -274,6 +274,7 @@ export default {
       const tran =
         this.$store.getters.roleProcess.find((i) => i.process_type === "SHD") || {};
       const { action } = tran ?? {};
+      console.log(action)
       return action ?? [];
     },
   },