doctor-admin-components 1.0.11 → 1.0.12-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "doctor-admin-components",
-  "version": "1.0.11",
-  "version1": "1.0.6-beta.4",
+  "version1": "1.0.11",
+  "version": "1.0.12-beta.2",
   "private": false,
   "main1": "lib/index.umd.min.js",
   "main": "packages/index.js",

package/packages/index.js

@@ -6,23 +6,22 @@
 // Vue.use(ZpwComTest); // use install
 // Vue.config.productionTip = false;
 
-import Cookies from 'js-cookie'
-import router from './src/router'
-import Element from 'element-ui'
-import enLocale from 'element-ui/lib/locale/lang/en'
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
-import './src/assets/icons' // icon
-import './src/assets/styles/element-variables.scss'
-
-import './src/assets/styles/index.scss' // global css
-import './src/assets/styles/ruoyi.scss' // ruoyi css
-import plugins from './src/plugins'
+import Cookies from "js-cookie";
+import router from "./src/router";
+import Element from "element-ui";
+import enLocale from "element-ui/lib/locale/lang/en";
+import zhLocale from "element-ui/lib/locale/lang/zh-CN";
+import "./src/assets/icons"; // icon
+import "./src/assets/styles/element-variables.scss";
+
+import "./src/assets/styles/index.scss"; // global css
+import "./src/assets/styles/ruoyi.scss"; // ruoyi css
+import plugins from "./src/plugins";
 
 // import VueI18n from 'vue-i18n'
 // Vue.use(plugins)
 // Vue.use(VueI18n)
 
-
 import {
   parseTime,
   resetForm,
@@ -31,59 +30,54 @@ import {
   selectDictLabels,
   handleTree,
   utc2local,
-  removeMarketContent
+  removeMarketContent,
 } from "./src/utils/ruoyi";
 
-import {
-  getDicts
-} from "./src/api/system/dict/data";
+import { getDicts } from "./src/api/system/dict/data";
 
-import DictTag from './src/components/DictTag'
+import DictTag from "./src/components/DictTag";
 
-import { download } from './src/utils/request'
-import moment from 'moment';
-import ImagePreview from "./src/components/ImagePreview"
-import ImageUpload from "./src/components/ImageUpload/aliyun"
+import { download } from "./src/utils/request";
+import moment from "moment";
+import ImagePreview from "./src/components/ImagePreview";
+import ImageUpload from "./src/components/ImageUpload/aliyun";
 
-import DictData from './src/components/DictData'
+import DictData from "./src/components/DictData";
 
 // 导入button组件
-import XButton from './Button'
-import {
-  Claim,
-  ContractTracingDetail
-} from "./src";
-import locale from 'element-ui/src/locale';
+import XButton from "./Button";
+import { Claim, ContractTracingDetail, PurchaseInvoiceUpload } from "./src";
+import locale from "element-ui/src/locale";
 
 // 组件列表
 const components = [
   XButton,
   Claim,
-  ContractTracingDetail
-]
-
+  ContractTracingDetail,
+  PurchaseInvoiceUpload,
+];
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，那么所有的组件都会被注册
 const install = function (Vue, options) {
-  console.log('---options', options);
-  Vue.use(plugins)
+  console.log("---options", options);
+  Vue.use(plugins);
   // Vue.use(VueI18n)
-  Vue.prototype.getDicts = getDicts
-  Vue.prototype.parseTime = parseTime
-  Vue.prototype.resetForm = resetForm
-  Vue.prototype.addDateRange = addDateRange
-  Vue.prototype.selectDictLabel = selectDictLabel
-  Vue.prototype.selectDictLabels = selectDictLabels
-  Vue.prototype.download = download
-  Vue.prototype.handleTree = handleTree
-  Vue.prototype.utc2local = utc2local
-  Vue.prototype.removeMarketContent = removeMarketContent
+  Vue.prototype.getDicts = getDicts;
+  Vue.prototype.parseTime = parseTime;
+  Vue.prototype.resetForm = resetForm;
+  Vue.prototype.addDateRange = addDateRange;
+  Vue.prototype.selectDictLabel = selectDictLabel;
+  Vue.prototype.selectDictLabels = selectDictLabels;
+  Vue.prototype.download = download;
+  Vue.prototype.handleTree = handleTree;
+  Vue.prototype.utc2local = utc2local;
+  Vue.prototype.removeMarketContent = removeMarketContent;
   Vue.prototype.$moment = moment;
-  Vue.component('ImagePreview', ImagePreview)
-  Vue.component('ImageUpload', ImageUpload)
-  Vue.component('DictTag', DictTag)
+  Vue.component("ImagePreview", ImagePreview);
+  Vue.component("ImageUpload", ImageUpload);
+  Vue.component("DictTag", DictTag);
 
-  DictData.install(Vue)
+  DictData.install(Vue);
 
   // 字典数据组件
   // const lang = options?.lang || Cookies.get('lang') || localStorage.getItem('lang') || (navigator.language === 'zh-CN' ? 'zh' : 'en') || 'en'
@@ -95,7 +89,7 @@ const install = function (Vue, options) {
   //     'en': require('./src/lang/en.json')
   //   }
   // })
-  
+
   // Vue.use(Element, {
   //   enLocale,
   //   zhLocale
@@ -103,20 +97,20 @@ const install = function (Vue, options) {
 
   // locale.use(lang);
   // locale.i18n(lang);
-  
+
   // new Vue({
   //   i18n,
   // }).$mount('#contract-detail')
 
   // 判断是否安装
-  if (install.installed) return
+  if (install.installed) return;
   // 遍历注册全局组件
-  components.map(component => Vue.component(component.name, component))
-}
+  components.map((component) => Vue.component(component.name, component));
+};
 
 // 判断是否是直接引入文件
-if (typeof window !== 'undefined' && window.Vue) {
-  install(window.Vue)
+if (typeof window !== "undefined" && window.Vue) {
+  install(window.Vue);
 }
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
@@ -124,5 +118,6 @@ export default {
   // 以下是具体的组件列表
   // XButton,
   ContractTracingDetail,
-  Claim
-}
+  Claim,
+  PurchaseInvoiceUpload,
+};

package/packages/src/api/biz/bizContract.js

@@ -26,6 +26,14 @@ export function getBizContract(id) {
   });
 }
 
+// 查询合同详细
+export function getSaleContractInfo(dealId) {
+  return request({
+    url: "/biz/contract/saleContract/" + dealId,
+    method: "get",
+  });
+}
+
 // 查询合同文件详细
 export function getBizContractFileInfo(id) {
   return request({

package/packages/src/api/biz/bizInvoice.js

@@ -1,161 +1,166 @@
-import request from '../../utils/request'
+import request from "../../utils/request";
 
 // 查询发票列表
 export function listBizInvoice(query) {
   return request({
-    url: '/biz/invoice/list',
-    method: 'get',
-    params: query
-  })
+    url: "/biz/invoice/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询有未收款的发票
 export function queryReceivableList(query) {
   return request({
-    url: '/biz/invoice/receivable/list',
-    method: 'get',
-    params: query
-  })
+    url: "/biz/invoice/receivable/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 资金预测
 export function queryCashForecastList(query) {
   return request({
-    url: '/biz/invoice/cashForecast/list',
-    method: 'get',
-    params: query
-  })
+    url: "/biz/invoice/cashForecast/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询发票详细
 export function getBizInvoice(id) {
   return request({
-    url: '/biz/invoice/' + id,
-    method: 'get'
-  })
+    url: "/biz/invoice/" + id,
+    method: "get",
+  });
 }
 
-
 // 获得信息与装运
 export function getInfoWithShipment(id) {
   return request({
-    url: '/biz/invoice/withShipment/' + id,
-    method: 'get'
-  })
+    url: "/biz/invoice/withShipment/" + id,
+    method: "get",
+  });
 }
 
 // 获取采购合同相关的发票
 export function getInvoiceListByContractId(id) {
   return request({
-    url: '/biz/invoice/getInvoiceListByContractId/' + id,
-    method: 'get'
-  })
+    url: "/biz/invoice/getInvoiceListByContractId/" + id,
+    method: "get",
+  });
 }
 
-
 // 获取采购合同 装运 相关的发票
 export function getInvoiceListByShipmentId(shipmentId) {
   return request({
-    url: '/biz/invoice/getInvoiceList/' + shipmentId,
-    method: 'get'
-  })
+    url: "/biz/invoice/getInvoiceList/" + shipmentId,
+    method: "get",
+  });
 }
 
 // 新增发票
 export function addBizInvoice(data) {
   return request({
-    url: '/biz/invoice',
-    method: 'post',
-    data: data
-  })
+    url: "/biz/invoice",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改发票
 export function updateBizInvoice(data) {
   return request({
-    url: '/biz/invoice',
-    method: 'put',
-    data: data
-  })
+    url: "/biz/invoice",
+    method: "put",
+    data: data,
+  });
 }
 
 // 点价发票
 export function pointPrice(data) {
   return request({
-    url: '/biz/invoice/pointPrice',
-    method: 'put',
-    data: data
-  })
+    url: "/biz/invoice/pointPrice",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除发票
 export function delBizInvoice(id) {
   return request({
-    url: '/biz/invoice/' + id,
-    method: 'delete'
-  })
+    url: "/biz/invoice/" + id,
+    method: "delete",
+  });
 }
 
-
-// 
+//
 export function fullCollectionOrPayment(id) {
   return request({
-    url: '/biz/invoice/financialStatus/' + id,
-    method: 'delete'
-  })
+    url: "/biz/invoice/financialStatus/" + id,
+    method: "delete",
+  });
 }
 
 // 导出发票
 export function exportBizInvoice(query) {
   return request({
-    url: '/biz/invoice/export',
-    method: 'get',
-    params: query
-  })
+    url: "/biz/invoice/export",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查找定金发票，没有则生成一张
 export function getDepositInvoice(data) {
   return request({
-    url: '/biz/invoice/getDepositInvoice',
-    method: 'post',
-    data: data
-  })
+    url: "/biz/invoice/getDepositInvoice",
+    method: "post",
+    data: data,
+  });
 }
 
 // 根据合同ids生成发票
 export function generateByContractIds(data) {
   return request({
-    url: '/biz/invoice/generateByContractIds',
-    method: 'post',
-    data: data
-  })
+    url: "/biz/invoice/generateByContractIds",
+    method: "post",
+    data: data,
+  });
 }
 
 // 根据装运ids生成尾款发票
 export function generateFinalInvoiceByShipmentId(data) {
   return request({
-    url: '/biz/invoice/generateFinalInvoiceByShipmentId',
-    method: 'post',
-    data: data
-  })
+    url: "/biz/invoice/generateFinalInvoiceByShipmentId",
+    method: "post",
+    data: data,
+  });
 }
 
 // 上传发票
 export function uploadBizInvoice(data) {
   return request({
-    url: '/biz/invoice/upload',
-    method: 'post',
-    data: data
-  })
+    url: "/biz/invoice/upload",
+    method: "post",
+    data: data,
+  });
 }
 
-
 // 上传发票
 export function uploadByShipmentId(data) {
   return request({
-    url: '/biz/invoice/uploadByShipmentId',
-    method: 'post',
-    data: data
-  })
-}
+    url: "/biz/invoice/uploadByShipmentId",
+    method: "post",
+    data: data,
+  });
+}
+
+// 上传发票
+export function uploadFinallyInvoice(data) {
+  return request({
+    url: "/biz/invoice/uploadFinallyInvoice",
+    method: "post",
+    data: data,
+  });
+}

package/packages/src/api/biz/file.js

@@ -0,0 +1,18 @@
+/*
+ * @Author: zhangpengwei 15038779532@163.com
+ * @Date: 2023-08-30 15:11:18
+ * @LastEditors: zhangpengwei 15038779532@163.com
+ * @LastEditTime: 2023-08-30 15:12:17
+ * @FilePath: /doctor-admin-components/packages/src/api/biz/file.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import request from '../../utils/request'
+
+// 查询文件信息列表
+export function v2Upload(data) {
+  return request({
+    url: '/v2/file/upload',
+    method: 'post',
+    data: data
+  })
+}

package/packages/src/components/DictTag/index.vue

@@ -46,13 +46,11 @@ export default {
     },
     ...mapGetters(["language"]),
     isChina() {
-      console.log('this.language',this.language);
-      return ["zh-CN", "zh-TW","zh"].includes(this.language);
+      return ["zh-CN", "zh-TW", "zh"].includes(this.language);
     },
   },
   methods: {
     getName(item) {
-      console.log('item',item);
       return this.isChina ? item?.label : item?.raw?.dictLabelEn;
     },
   },