doctor-admin-components 1.0.14-beta.87 → 1.0.14-beta.88

package/README.md

@@ -61,4 +61,27 @@ Enter one-time password:
 
 
 3 拉取最新版本镜像 点击同步 可能会有延迟
-https://npmmirror.com/package/doctor-admin-components/versions?version=1.0.14-beta.72
+https://npmmirror.com/package/doctor-admin-components/versions?version=1.0.14-beta.72
+
+
+4.认证发布（登录和发布 均通过打开浏览器进行认证）：
+tyzl@tyzl-zxx-m1pro common-components % node -v
+v20.19.3
+
+tyzl@tyzl-zxx-m1pro common-components % npm login
+npm notice Log in on https://registry.npmjs.org/
+Login at:
+https://www.npmjs.com/login?next=/login/cli/f6b5899d-e811-4a84-adc5-90fc2413ff31
+Press ENTER to open in the browser...
+
+Logged in on https://registry.npmjs.org/.
+tyzl@tyzl-zxx-m1pro common-components % npm publish --tag=beta
+
+
+npm notice
+npm notice Publishing to https://registry.npmjs.org/ with tag beta and default access
+Authenticate your account at:
+https://www.npmjs.com/auth/cli/4e0a2c7a-6e12-4ca1-9462-5f8ec27e418e
+Press ENTER to open in the browser...
+
++ doctor-admin-components@1.0.14-beta.86

package/package.json

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

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

@@ -8,6 +8,13 @@ export function listBizShipment(query) {
     params: query
   })
 }
+export function getBalanceInvoice(data) {
+  return request({
+    url: '/biz/invoice/balanceInvoice',
+    method: 'post',
+    data: data
+  })
+}
 
 // 查询装运详细
 export function getBizShipment(shipmentId) {

package/packages/src/views/biz/bizFileInfo/contract.vue

@@ -1303,8 +1303,8 @@
         <el-button type="primary" @click="addShipment">{{ $t('contractDetail.confirm') }}</el-button>
       </span>
     </el-dialog>
-    <shipment-add ref="shipmentGen" @refresh="handleRefresh" />
-
+    <shipment-add ref="shipmentGen" @openGenerateLive="openGenerateLive" />
+    <generate-live-open ref="generateLiveOpen"></generate-live-open>
     <shipment-purchase-amount 
       ref="shipmentPurchaseAmount"
       :getContractFileInfoCallback="getContractFileInfoCallback"
@@ -1318,6 +1318,7 @@ import {
   chargedShipment,
   getPurchaseAmount,
 } from '../../../api/biz/bizShipment';
+import GenerateLiveOpen from './generateLiveOpen.vue'
 import { listBizFileInfo, addBizFileInfo } from '../../../api/biz/bizFileInfo';
 import { getBizContractFileInfo } from '../../../api/biz/bizContract';
 import FileShow from './fileShow.vue';
@@ -1362,6 +1363,7 @@ let handleGenerateflag1 = false;
 export default {
   name: 'ContractFile',
   components: {
+    GenerateLiveOpen,
     FileShow,
     ContractFileUpload,
     ContractFileDragUpload,
@@ -1553,6 +1555,9 @@ export default {
   },
   mounted() { },
   methods: {
+    openGenerateLive(shipment) {
+      this.$refs.generateLiveOpen.handleOpen(shipment)
+    },
     async clickAddShipment() {
       //弹出选择框，选择关联的销售合同，点击确定后，执行新增
       const list = this.contract.associationContractList || []

package/packages/src/views/biz/bizFileInfo/generateLiveOpen.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="">
+    <el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
+      {{ '报价类型为' + form.quoteType + ',确认用这这个装运单生成尾款发票' }}
+      <div slot="footer" class="dialog-footer">
+        <el-form :model="form" label-width="100px" :rules="rules" ref="ruleForm">
+          <div v-if="form.quoteType !== 'FIXED'">
+            <el-row class="bordered-row" v-if="checkDetailListHaveElement('element')">
+              <el-col :span="6"><div v-html="getItemName('element')"></div></el-col>
+              <el-col :span="18">
+                <!-- ag,al,au,bi,co,cu,li,ni,pb,sb,sn,zn -->
+                <el-form-item label="LME Ag=" v-if="checkElement('ag')" prop="elementPoint.ag">
+                  <el-input v-model="form.elementPoint.ag" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Al=" v-if="checkElement('al')" prop="elementPoint.al">
+                  <el-input v-model="form.elementPoint.al" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Au=" v-if="checkElement('au')" prop="elementPoint.au">
+                  <el-input v-model="form.elementPoint.au" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Bi=" v-if="checkElement('bi')" prop="elementPoint.bi">
+                  <el-input v-model="form.elementPoint.bi" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Co=" v-if="checkElement('co')" prop="elementPoint.co">
+                  <el-input v-model="form.elementPoint.co" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Cu=" v-if="checkElement('cu')" prop="elementPoint.cu">
+                  <el-input v-model="form.elementPoint.cu" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Li=" v-if="checkElement('li')" prop="elementPoint.li">
+                  <el-input v-model="form.elementPoint.li" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Ni=" v-if="checkElement('ni')" prop="elementPoint.ni">
+                  <el-input v-model="form.elementPoint.ni" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Pb=" v-if="checkElement('pb')" prop="elementPoint.pb">
+                  <el-input v-model="form.elementPoint.pb" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Sb=" v-if="checkElement('sb')" prop="elementPoint.sb">
+                  <el-input v-model="form.elementPoint.sb" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Sn=" v-if="checkElement('sn')" prop="elementPoint.sn">
+                  <el-input v-model="form.elementPoint.sn" type="number"></el-input>
+                </el-form-item>
+                <el-form-item label="LME Zn=" v-if="checkElement('zn')" prop="elementPoint.zn">
+                  <el-input v-model="form.elementPoint.zn" type="number"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row class="bordered-row" v-if="checkDetailListHaveElement('unElement')">
+              <el-col :span="6"><div v-html="getItemName('unElement')"></div></el-col>
+              <el-col :span="18">
+                <el-form-item label="临时价格" prop="pointPrice">
+                  <el-input type="number" v-model="form.pointPrice" placeholder="请输入临时价格" size="small" /> </el-form-item
+              ></el-col>
+            </el-row>
+          </div>
+        </el-form>
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { updateWithContainerAndInvoice, getBalanceInvoice } from '../../../api/biz/bizShipment'
+
+export default {
+  name: '',
+  props: {
+    refresh: {
+      type: Function,
+      default: null
+    }
+  },
+  components: {},
+  data() {
+    return {
+      rules: {
+        pointPrice: [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.ag': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.al': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.au': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.bi': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.co': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.cu': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.li': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.ni': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.pb': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.sb': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.sn': [{ required: true, message: '请输入', trigger: 'blur' }],
+        'elementPoint.zn': [{ required: true, message: '请输入', trigger: 'blur' }]
+      },
+      title: '生成尾款发票',
+      open: false,
+      form: {}
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+    checkElement(element) {
+      return this.form?.elementPoint && this.form.elementPoint[element] != null
+    },
+    //转换元素
+    formatElement(form) {
+      var elementPoint = {}
+      form.contractDetailList.forEach((contractDetail) => {
+        const elementContent = contractDetail?.elementContent
+        if (elementContent) {
+          Object.keys(elementContent).forEach((key) => {
+            if (elementContent[key]) {
+              elementPoint[key] = elementPoint[key] || 8000
+            }
+          })
+        }
+      })
+      form.elementPoint = elementPoint
+    },
+    //是否有多元素商品
+    checkDetailListHaveElement(type) {
+      if (type == 'element') {
+        return this.form.contractDetailList?.filter((item) => this.checkElementItem(item?.elementContent)).length > 0
+      } else {
+        return this.form.contractDetailList?.filter((item) => !this.checkElementItem(item?.elementContent)).length > 0
+      }
+    },
+    //获取商品
+    getItemName(type) {
+      const items = this.form.contractDetailList?.filter((item) =>
+        type === 'element' ? this.checkElementItem(item?.elementContent) : !this.checkElementItem(item?.elementContent)
+      )
+
+      // 使用map将每个项目转换为<div>标签，然后用join合并为单个字符串
+      return items.map((item) => `<div>${item?.askName}</div>`).join('')
+    },
+    handleOpen(shipment) {
+      this.reset()
+      this.form = shipment
+      const contractDetailList = []
+      shipment.containerList.forEach((container) => {
+        container.containerDetailList.forEach((containerDetail) => {
+          contractDetailList.push(containerDetail.contractDetail)
+        })
+      })
+      this.form.contractDetailList = contractDetailList
+      this.formatElement(this.form)
+      this.open = true
+    },
+    submit() {
+      this.$refs['ruleForm'].validate((valid) => {
+        if (valid) {
+          const loading = this.openLoading()
+          updateWithContainerAndInvoice({ ...this.form, shipmentId: this.form.shipmentId, pointPrice: this.form.pointPrice, elementPoint: this.form.elementPoint })
+            .then((res) => {
+              if (res?.code !== 200) {
+                this.refresh && this.refresh()
+                this.open = false
+                loading.close()
+                return this.$message.error(res.message || '服务器异常')
+              }
+              getBalanceInvoice({ shipmentId: this.form.shipmentId }).then((res) => {
+                const invoice = res.data
+                this.refresh && this.refresh()
+                this.open = false
+                loading.close()
+                if (invoice) {
+                  this.$router.push({
+                    path: '/invoice/detail/' + invoice.id,
+                    params: { id: invoice.id }
+                  })
+                }
+              })
+            })
+            .finally(() => {
+              loading.close()
+            })
+        } else {
+          return false
+        }
+      })
+    },
+    cancel() {
+      this.reset()
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        shipmentId: null,
+        pointPrice: null,
+        quoteType: null,
+        elementPoint: {
+          pb: null,
+          cu: null,
+          ni: null,
+          al: null,
+          co: null,
+          li: null,
+          zn: null,
+          sb: null,
+          bi: null,
+          sn: null,
+          ag: null,
+          au: null
+        }
+      }
+    }
+  },
+  created() {},
+  mounted() {},
+  beforeDestroy() {}
+}
+</script>
+<style lang="scss" scoped></style>