44

.gitignore

@@ -21,5 +21,5 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw?
-vue.config.js
+*.vue.config.js
 package-lock.json

src/main.js

@@ -66,7 +66,6 @@ Vue.use(VueClipboard);
 let instance = null;
 
 function render(props = {}) {
-
   const { container, routerBase } = props;
   // const router = new VueRouter({
   //   base: window.__POWERED_BY_QIANKUN__ ? routerBase : process.env.BASE_URL,

src/styles/transition/common.scss

@@ -177,4 +177,20 @@ table th .is-required::before{
 
 .el-table--medium .el-table__cell {
   padding: 2px 0 !important;
-}
+}
+
+.el-button--medium {
+  padding: 7px 10px  !important;
+  font-size: 12px  !important;
+  border-radius: 3px  !important;
+}
+.el-button--small {
+  padding: 7px 10px  !important;
+  font-size: 12px  !important;
+  border-radius: 3px  !important;
+}
+
+.el-input--medium .el-input__inner {
+  height: 32px  !important;
+  line-height: 32px  !important;
+}

src/views/material/BOMmanage/components/detailedList.vue

@@ -46,6 +46,7 @@
           v-model="row.produceType"
           filterable
           multiple
+          collapse-tags
           class="ele-block"
           size="mini"
         >
@@ -98,7 +99,7 @@
 
       <!-- 表头工具栏 -->
       <template v-slot:action="{ row }">
-        <el-link type="danger" :underline="false" icon="el-icon-delete">
+        <el-link type="danger" :underline="false" icon="el-icon-delete" @click="handleDel(row)">
           删除
         </el-link>
       </template>
@@ -178,7 +179,7 @@
             prop: 'produceType',
             slot: 'produceType',
             label: '生产类型',
-            width: 150
+            width: 160
           },
 
           {
@@ -349,6 +350,10 @@
         });
       },
 
+      handleDel(row) {
+        console.log(row)
+      },
+
     }
   };
 </script>

src/views/material/BOMmanage/detailsPop.vue

@@ -80,7 +80,7 @@
             >
 
             <el-button
-              type="warning"
+              type="primary"
               size="mini"
               @click="handSubmit"
               v-if="
@@ -91,7 +91,7 @@
               提交发布
             </el-button>
 
-            <el-button type="warning" size="mini" @click="handleSave">
+            <el-button type="primary" size="mini" @click="handleSave">
               保存
             </el-button>
           </div>

vue.config.js

@@ -33,8 +33,8 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.124:50001',
         // target: 'http://192.168.1.147:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
-        target: 'http://192.168.1.116:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''