Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts

@@ -277,6 +277,17 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 100
     } ,
   },
+  { 
+    label: '结算方式', 
+    field: 'settlementType', 
+    dictType: DICT_TYPE.SETTLEMENT_TYPE,
+    dictClass: 'string',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 120
+    } ,
+  },
   { 
     label: '项目', 
     field: 'project', 

src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@@ -221,18 +221,18 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+  // {
-    label: '结算方式',
+  //   label: '结算方式',
-    field: 'settlementType',
+  //   field: 'settlementType',
-    dictType: DICT_TYPE.SETTLEMENT_TYPE,
+  //   dictType: DICT_TYPE.SETTLEMENT_TYPE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isSearch: true,
+  //   isSearch: true,
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    }
+  //   }
-  },
+  // },
   {
     label: '是否可用',
     field: 'available',

src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/index.vue

@@ -128,17 +128,19 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       //row['uom'] = val[0]['uom']
     } else {
       const setV = {}
-      SupplieritemApi.getSupplieritemPage({
+      setV[formField] = val[0][searchField]
-        supplierCode: val[0]['supplierCode'],
+      // SupplieritemApi.getSupplieritemPage({
-        itemCode: val[0]['itemCode']
+      //   supplierCode: val[0]['supplierCode'],
-      }).then(res => {
+      //   itemCode: val[0]['itemCode']
-        if(res?.list[0]?.settlementType == 'ONLINE'){
+      // }).then(res => {
-          setV['issueRecordNumber'] = val[0]['number']
+      //   if(res?.list[0]?.settlementType == 'ONLINE'){
-          formRef.setValues(setV)
+      //     setV['issueRecordNumber'] = val[0]['number']
-        } else{
+      //     formRef.setValues(setV)
-          message.error('找不到对应的结算方式')
+      //   } else{
-        }
+      //     message.error('找不到对应的结算方式')
-      })
+      //   }
+      // })
+      formRef.setValues(setV)
     }
   })
 }