marymelisa 4 år sedan
förälder
incheckning
ed43341841

+ 3 - 3
src/views/business/purchase/setup.ts

@@ -63,13 +63,13 @@ export function btnAndComp() {
     // 打开新增页的弹窗 返回打开弹窗的方法
     const { openAction: addAction } = openModal('addCustomInfo');
     // 创建详情页并写入右键菜单列表(每个页面都有,写死)
-    detailButton('customDetail', contextMenuList);
+    // detailButton('customDetail', contextMenuList);
     // 通过code跟弹窗建立联系 返回写入右键的方法
-    const { action: deleteAction } = permissionButton('purchase_pending_someprice', '点价登记', contextMenuList);
+    // const { action: deleteAction } = permissionButton('purchase_pending_someprice', '点价登记', contextMenuList);
 
     const stop = watchEffect(() => {
         // 判断是否有权限 有就写入
-        hasPermission('custom_info_btn_delete') && deleteAction();
+        // hasPermission('custom_info_btn_delete') && deleteAction();
     });
     return {
         stop,

+ 24 - 24
src/views/information/custom/compoments/add/index.vue

@@ -215,30 +215,30 @@ export default defineComponent({
 
 <style lang="less">
 .add-custom {
-}
-.upload {
-    display: inline-flex;
-    .ant-btn.uploadBtn {
-        width: 60px;
-        height: 30px;
-        background: @m-blue0;
-        border: 0;
-        padding: 0;
-        text-align: center;
-        font-size: 14px;
-        color: @m-white0;
-        .rounded-corners(3px);
-        &:hover {
-            background: rgba(@m-blue0, 0);
-            color: rgba(@m-white0, 0.8);
-        }
-    }
-    .look {
-        color: @m-blue0;
-        font-size: 14px;
-        margin-left: 10px;
-        cursor: pointer;
-    }
+  .upload {
+      display: inline-flex;
+      .ant-btn.uploadBtn {
+          width: 60px;
+          height: 30px;
+          background: @m-blue0;
+          border: 0;
+          padding: 0;
+          text-align: center;
+          font-size: 14px;
+          color: @m-white0;
+          .rounded-corners(3px);
+          &:hover {
+              background: rgba(@m-blue0, 0);
+              color: rgba(@m-white0, 0.8);
+          }
+      }
+      .look {
+          color: @m-blue0;
+          font-size: 14px;
+          margin-left: 10px;
+          cursor: pointer;
+      }
+  }
 }
 </style
 >;

+ 13 - 13
src/views/information/custom/compoments/detail/index.vue

@@ -126,17 +126,17 @@
 
 <style lang="less">
     .custom-detail {
+        .ant-form.inlineForm {
+            margin-top: 20px;
+        }
+        .white {
+            color: @m-white0;
+        }
+        .blue {
+            color: @m-blue0;
+        }
+        .green {
+            color: @m-green0;
+        }
     }
-    .ant-form.inlineForm {
-        margin-top: 20px;
-    }
-    .white {
-        color: @m-white0;
-    }
-    .blue {
-        color: @m-blue0;
-    }
-    .green {
-        color: @m-green0;
-    }</style
->;
+</style>;

+ 2 - 2
src/views/information/custom/compoments/disable/index.vue

@@ -125,5 +125,5 @@
 
 <style lang="less">
     .arehouse-disable {
-    }</style
->;
+    }
+</style>

+ 45 - 45
src/views/information/custom/compoments/filterTable/index.vue

@@ -78,58 +78,58 @@ export default defineComponent({
     display: inline-flex;
     padding-top: 9px;
     padding-bottom: 6px;
-}
-.ant-select-single:not(.ant-select-customize-input) {
-    margin-right: 10px;
-    // background: #252D34;
-    // .rounded-corners(3px);
-    .ant-select-selector {
-        height: 30px;
-        padding: 0 8px;
-        background: @m-grey9;
-        border: none;
-        .rounded-corners(3px);
-        color: @m-grey10;
+    .ant-select-single:not(.ant-select-customize-input) {
+        margin-right: 10px;
+        // background: #252D34;
+        // .rounded-corners(3px);
+        .ant-select-selector {
+            height: 30px;
+            padding: 0 8px;
+            background: @m-grey9;
+            border: none;
+            .rounded-corners(3px);
+            color: @m-grey10;
+            .ant-select-arrow {
+                right: 8px;
+                color: @m-grey1;
+            }
+        }
         .ant-select-arrow {
-            right: 8px;
             color: @m-grey1;
         }
+        .ant-select-selection-item {
+            color: @m-white1;
+        }
     }
-    .ant-select-arrow {
-        color: @m-grey1;
-    }
-    .ant-select-selection-item {
-        color: @m-white1;
+    .conditionSelect + .conditionSelect {
+        margin-left: 10px;
     }
-}
-.conditionSelect + .conditionSelect {
-    margin-left: 10px;
-}
-.selectBtn.ant-btn {
-    margin-left: 10px;
-    width: 80px;
-    height: 30px;
-    line-height: 31px;
-    text-align: center;
-    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
-    border: 0;
-    color: @m-white0;
-    font-size: 14px;
-    .rounded-corners(3px);
-    &:hover,
-    &:focus {
-        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
-        color: rgba(@m-white0, 0.8);
+    .selectBtn.ant-btn {
+        margin-left: 10px;
+        width: 80px;
+        height: 30px;
+        line-height: 31px;
+        text-align: center;
+        background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
         border: 0;
+        color: @m-white0;
+        font-size: 14px;
+        .rounded-corners(3px);
+        &:hover,
+        &:focus {
+            background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
+            color: rgba(@m-white0, 0.8);
+            border: 0;
+        }
     }
-}
-.operBtn.ant-btn:extend(.selectBtn.ant-btn) {
-    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
-    &:hover,
-    &:focus {
-        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
-        color: rgba(@m-white0, 0.8);
-        border: 0;
+    .operBtn.ant-btn:extend(.selectBtn.ant-btn) {
+        background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
+        &:hover,
+        &:focus {
+            background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
+            color: rgba(@m-white0, 0.8);
+            border: 0;
+        }
     }
 }
 </style>;

+ 2 - 2
src/views/information/custom/list/normal-use/index.vue

@@ -76,5 +76,5 @@
 
 <style lang="less">
     .custom-normal {
-    }</style
->;
+    }
+</style>

+ 42 - 26
src/views/information/goods/components/add/index.vue

@@ -58,13 +58,38 @@
       </fieldset>
       <fieldset class="formFieldSet">
         <legend>品类信息</legend>
-        <!-- <a-table class="dialogTable" :data-source="dataSource" :columns="columns" :pagination="false">
-          <a slot="name" slot-scope="text">{{ text }}</a>
-          <span slot="customTitle"><a-icon type="smile-o" /> Name</span>
-        </a-table> -->
         <a-table  class="dialogTable" :columns="columns" :data-source="dataSource" :pagination="false">
-          <a slot="name" slot-scope="text">{{ text }}</a>
-          <span slot="customTitle">品类</span>
+          <template #type>
+            <a-input class="dialogInput"></a-input>
+          </template>
+          <template #customType>
+            <span>
+              <span class="red">*</span>
+              品类
+            </span>
+          </template>
+          <template #unit>
+            <a-input class="dialogInput"></a-input>
+          </template>
+          <template #customUnit>
+            <span>
+              <span class="red">*</span>
+              单位
+            </span>
+          </template>
+          <template #coefficient>
+            <a-input class="dialogInput"></a-input>
+          </template>
+          <template #customCoefficient>
+            <span>
+              <span class="red">*</span>
+              标仓系数
+            </span>
+          </template>
+          <template #action>
+            <a-button class="minusBtn"></a-button>
+            <a-button class="plusBtn"></a-button>
+          </template>
         </a-table>
       </fieldset>
     </a-form>
@@ -84,39 +109,30 @@ export default defineComponent({
         const loading = ref<boolean>(false);
         const columns = [
           {
-            // title: 'name',
-            dataIndex: 'name',
-            key: 'name',
-            slots: { title: 'customTitle' },
-            scopedSlots: { customRender: 'name' },
+            dataIndex: 'type',
+            key: 'type',
+            slots: { title: 'customType', customRender: 'type' },
           },
           {
-            title: 'age',
-            dataIndex: 'age',
-            key: 'age',
+            dataIndex: 'unit',
+            key: 'unit',
+            slots: { title: 'customUnit', customRender: 'unit' },
           },
           {
-            title: 'address',
-            dataIndex: 'address',
-            key: 'address',
+            dataIndex: 'coefficient',
+            key: 'coefficient',
+            slots: { title: 'customCoefficient', customRender: 'coefficient' },
           },
           {
-            title: 'tags',
-            key: 'tags',
-            dataIndex: 'tags',
-            // scopedSlots: { customRender: 'tags' },
-          },
-          {
-            title: 'action',
+            title: '操作',
             key: 'action',
-            scopedSlots: { customRender: 'action' },
           },
         ];
 
         const dataSource = [
           {
             key: '1',
-            name: 'John Brown',
+            type: 'John Brown',
             age: 32,
             address: 'New York No. 1 Lake Park',
             tags: ['nice', 'developer'],