doctor-admin-components 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doctor-admin-components",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "version1": "1.0.6-beta.4",
   "private": false,
   "main1": "lib/index.umd.min.js",
@@ -12,7 +12,7 @@
     "lib": "vue-cli-service build --target lib --name index --dest lib packages/index.js"
   },
   "dependencies": {
-    "ali-oss": "^6.17.1",
+    "ali-oss": "^6.18.0",
     "axios": "^1.4.0",
     "core-js": "^3.31.1",
     "element-ui": "^2.15.13",
@@ -22,6 +22,7 @@
     "jspdf": "^2.5.1",
     "jszip": "^3.10.1",
     "moment": "^2.29.4",
+    "uuid": "^9.0.0",
     "vue": "^2.6.14",
     "vue-i18n": "8.25.0",
     "vue-router": "^3.5.1",

package/packages/index.js

@@ -43,17 +43,22 @@ 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 DictData from './src/components/DictData'
 
 // 导入button组件
 import XButton from './Button'
-import ContractTracingDetail from "./src";
+import {
+  Claim,
+  ContractTracingDetail
+} from "./src";
 import locale from 'element-ui/src/locale';
 
 // 组件列表
 const components = [
   XButton,
+  Claim,
   ContractTracingDetail
 ]
 
@@ -75,6 +80,7 @@ const install = function (Vue, options) {
   Vue.prototype.removeMarketContent = removeMarketContent
   Vue.prototype.$moment = moment;
   Vue.component('ImagePreview', ImagePreview)
+  Vue.component('ImageUpload', ImageUpload)
   Vue.component('DictTag', DictTag)
 
   DictData.install(Vue)
@@ -112,11 +118,11 @@ const install = function (Vue, options) {
 if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue)
 }
-
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
   // 以下是具体的组件列表
   // XButton,
-  ContractTracingDetail
+  ContractTracingDetail,
+  Claim
 }

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

@@ -0,0 +1,40 @@
+/*
+ * @Author: zhangpengwei 15038779532@163.com
+ * @Date: 2023-08-08 16:26:32
+ * @LastEditors: zhangpengwei 15038779532@163.com
+ * @LastEditTime: 2023-08-08 16:31:42
+ * @FilePath: /doctor-admin-components/packages/src/api/biz/bizClaim.js
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import request from '../../utils/request'
+
+/**
+ * @description: 更新索赔
+ * @param {*} data
+ * @return {*}
+ */
+
+export function updateClaim(query) {
+  return request({
+    url: '/claim/updateClaim',
+    method: 'post',
+    params: query
+  })
+}
+
+/**
+ * @description: 查询索赔记录
+* @param {*} data
+* @return {*}
+*/
+
+export function queryClaimRecord(query) {
+    return request({
+      url: '/claim/queryClaimRecord',
+      method: 'get',
+      params: query
+    })
+  }
+
+
+

package/packages/src/index.js

@@ -2,7 +2,7 @@
  * @Author: error: git config user.name && git config user.email & please set dead value or install git
  * @Date: 2022-07-25 11:24:53
  * @LastEditors: zhangpengwei 15038779532@163.com
- * @LastEditTime: 2023-07-24 18:50:34
+ * @LastEditTime: 2023-08-08 16:51:02
  * @FilePath: /zpw-com-test/src/lib-components/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -15,10 +15,18 @@
 // // export { default as Test } from './views/test.vue111111111111';
 
 import ContractTracingDetail from './views/biz/contractTracing/contractTracingDetail.vue'
+import Claim from './views/biz/claim/Claim.vue'
+
 // 为组件提供 install 安装方法，供按需引入
+
 ContractTracingDetail.install = function (Vue) {
   Vue.component(ContractTracingDetail.name, ContractTracingDetail)
 }
+
+Claim.install = function (Vue) {
+  Vue.component(Claim.name, Claim)
+}
+
 // 导出组件
-export default ContractTracingDetail
+export  {ContractTracingDetail, Claim}
 

package/packages/src/utils/auth.js

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2022-10-08 10:03:50
  * @LastEditors: zhangpengwei 15038779532@163.com
- * @LastEditTime: 2023-07-28 12:02:04
+ * @LastEditTime: 2023-08-11 17:57:11
  * @FilePath: /zpw-com-test/src/utils/auth.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -12,7 +12,7 @@ const TokenKey = 'Admin-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)
-  // return 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQ5YmIxNjVjLTE5NGYtNDRjNi05MTIxLTJmMWI1YTcxYWQ3NCJ9.by6_eokPFy9S5CpINhULwOTaLPU32tCrO5r-zftSuUFpVonD5nOHxbmUiB6IfMmHeZtnop9ZMP7PaG99NNt_Rg'
+  // return '9206abb810d04b678acf967175fa62df'
   
 }
 

package/packages/src/views/biz/claim/Claim.vue

@@ -0,0 +1,335 @@
+<!--
+ * @Author: zhangpengwei 15038779532@163.com
+ * @Date: 2023-08-03 11:13:07
+ * @LastEditors: zhangpengwei 15038779532@163.com
+ * @LastEditTime: 2023-08-08 17:24:35
+ * @FilePath: /transaction 官网/src/pages/claim/Feedback.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+    <div>
+        <div class="feedback-page-top">
+          <div>索赔</div>
+          <el-button type="primary" @click.stop="back">返回</el-button>
+        </div>
+        <div style="transform:translateX(-50%);margin-left:50%;margin-top:30px">
+          <el-form label-suffix=":" style="margin-top:30px" ref="selectClaim" :model="form" label-width="120px" :rules="rules">
+            <div class="title">索赔ID：{{ info && info.claimId }}</div>
+            <div class="title" style="margin-top:10px">索赔主张</div>
+            <div style="padding-left:50px;margin-top:30px;margin-bottom:10px">索赔类型：{{claimTypeCom}}</div>
+            <el-form-item label="短重重量" prop="missingWeight">
+              <el-input class="el-input-width" v-model="claimInfo.missingWeight"></el-input> MT
+            </el-form-item>
+            <el-form-item label="索赔总价" :prop="info.type == '1' ? 'weightTotalPrice' : 'qualityTotalPrice'">
+              <el-input class="el-input-width" v-model="info.type == '1' ? claimInfo.weightTotalPrice : claimInfo.qualityTotalPrice"></el-input> 美元
+            </el-form-item>
+            <el-form-item label="索赔原因" :prop="info.type == '1' ? 'weightReason' : 'qualityReason'">
+              <el-input 
+                type="textarea" 
+                style="width: 350px"
+                v-model="info.type == '1' ? claimInfo.weightReason : claimInfo.qualityReason"   
+                :autosize="{ minRows: 4}"
+                maxlength="6000"
+                show-word-limit
+              ></el-input>
+            </el-form-item>
+    
+            <div class="title">合同信息</div>
+            <div style="padding-left:50px;margin:10px 0;">合同号：ARS20230207-81701</div>
+            <el-form-item label="" style="width:max-content">
+              <div>
+                <el-table
+                  :data="tableData"
+                  :span-method="objectSpanMethod"
+                  border
+                  style="width: 100%; margin-top: 20px">
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="id"
+                    label="柜号"
+                    width="180">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="name"
+                    label="商品名称">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="amount1"
+                    label="毛重">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="amount2"
+                    label="皮重">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="amount3"
+                    label="净重">
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-form-item>
+    
+            <div class="title">货物信息</div>
+            <div style="background-color:#eee;min-width:750px;padding:20px 50px 20px 0;">
+              <div style="padding-left:50px;margin:10px 0;">合同号：ARS20230207-81701</div>
+              <el-form-item label="">
+                <div>称重结果：</div>
+                <el-table
+                  :data="tableData"
+                  :span-method="objectSpanMethod"
+                  border
+                  style="width: 100%; margin-top: 20px">
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="id"
+                    label="柜号"
+                    width="180"
+                    >
+                    <template slot-scope="scope">
+                      <div contenteditable="true"  style="border: 1px solid #eee">
+                        {{ scope.row.id }}
+                      </div>
+                    </template>
+  
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="name"
+                    label="商品名称">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="amount1"
+                    label="毛重">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="amount2"
+                    label="皮重">
+                  </el-table-column>
+                  <el-table-column
+                    header-align="center"
+                    align="center"
+                    prop="amount3"
+                    label="净重">
+                  </el-table-column>
+                </el-table>
+                <div>
+                  <span>码头称重：</span>
+                  <file-upload v-model="arr"></file-upload>
+                </div>
+  
+              </el-form-item>
+            </div>
+    
+            <div class="title">其它信息</div>
+            <div>如有其它信息需要补充，在这里补充</div>
+            <el-form-item label="">
+              <div>123123</div>
+            </el-form-item>
+            
+    
+    
+    
+            <!-- submit -->
+            <el-form-item>
+              <el-button @click.stop="back">取消</el-button>
+              <el-button type="primary" @click="onSubmit">开始索赔</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+    </div>
+  </template>
+  
+  <script>      
+  import { queryClaimRecord } from "../../../api/biz/bizClaim";
+  
+  export default {
+    name: "Claim",
+    components: {
+    },
+    data() {
+      return {
+          arr:[],
+          form: {
+            type: '',
+            name: '',
+            desc:''
+          },
+          rules: {
+              type: [
+                { required: true, message: '请选择货物反馈', trigger: 'blur' }
+              ],
+              name: [
+                { required: true, message: '请选择索赔货物', trigger: 'blur' }
+              ],
+              desc: [
+                { required: true, message: '请选择索赔货物', trigger: 'blur' }
+              ]
+          },
+          info: {
+            claimId: this.$route.query.claimId,
+            type: this.$route.query.type,
+          },
+          locale: this.$store.state.locale,
+          claimInfo: {
+            missingWeight: null,
+            qualityReason: null,
+            qualityTotalPrice: null,
+            weightReason: null,
+            weightTotalPrice: null
+          },
+          tableData: [{
+            id: '12987122',
+            name: '王小虎',
+            amount1: '234',
+            amount2: '3.2',
+            amount3: 10
+          }, {
+            id: '12987123',
+            name: '王小虎',
+            amount1: '165',
+            amount2: '4.43',
+            amount3: 12
+          }, {
+            id: '12987124',
+            name: '王小虎',
+            amount1: '324',
+            amount2: '1.9',
+            amount3: 9
+          }, {
+            id: '12987125',
+            name: '王小虎',
+            amount1: '621',
+            amount2: '2.2',
+            amount3: 17
+          }, {
+            id: '12987126',
+            name: '王小虎',
+            amount1: '539',
+            amount2: '4.1',
+            amount3: 15
+          }]
+        }
+    },
+  
+    mounted() {},
+  
+    created() {
+      this.queryClaimRecordFun()
+    },
+  
+    methods: {
+      async queryClaimRecordFun () {
+        const res = await queryClaimRecord({
+          data: {
+            id: this.info.claimId
+          }
+        })
+  
+        if (res.code == 200) {
+          console.log(res.data);
+          this.claimInfo = res.data
+        }
+  
+      },
+      /**
+       * @description: 表格合并
+       * @param {*}
+       * @return {*}
+       */
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex === 0) {
+            if (rowIndex % 2 === 0) {
+              return {
+                rowspan: 2,
+                colspan: 1
+              };
+            } else {
+              return {
+                rowspan: 0,
+                colspan: 0
+              };
+            }
+          }
+        },
+      /**
+       * @description: 返回上一页面
+       * @return {*}
+       */
+      back() {
+          this.$router.go(-1);
+      },
+  
+      /**
+       * @description: 反馈提交
+       * @return {*}
+       */
+       onSubmit() {
+        this.$refs.selectClaim.validate((valid) => {
+          if (valid) {
+           console.log('submit!');
+          } else {
+            const element = document.getElementById("feedback");
+            element && element.scrollIntoView({ behavior: "smooth", block: "start", inline: "nearest" });
+            return false;
+          }
+        });
+      }
+    },
+    computed: {
+      claimTypeCom() {
+        const claimTypeMap = {
+          '1': {
+            'cn':'重量索赔',
+            'en':'Weight claim',
+          },
+          '2': {
+            'cn':'质量索赔',
+            'en':'Quality claim',
+          },
+          '3': {
+            'cn':'重量索赔+质量索赔',
+            'en':'Weight claim + Quality claim',
+          }
+        }
+        const obj = claimTypeMap[this.info.type || '1']
+  
+        return this.locale === 'zh' ? obj.cn : obj.en
+      }
+    }
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .feedback-page {
+    width: 1152px;
+    padding: 100px;
+    margin: 0 auto;
+    .feedback-page-top {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    .el-input-width {
+      width:203px;
+    }
+    .title {
+      font-size:16px;
+      font-weight: 600;
+    }
+  }
+  </style>

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

@@ -101,8 +101,8 @@
             type="text"
             @click="handleUserCompany(form.supplierCompanyId, 'seller')"
             buyerAccountId
-            >Select Seller's Company</el-button
-          >
+            >Select Seller's Company
+          </el-button>
         </el-col>
       </el-row>
       <el-form-item label="Company Name" label-width="120px">
@@ -440,42 +440,58 @@
           v-model="form.depositDays"
           size="mini"
           clearable
-          style="width: 240px"
+          style="width: 130px"
         >
-          <template slot="append">Days after the contract</template>
+          <template slot="append">Days</template>
         </el-input>
-      </el-form-item>
-      <el-form-item>
         <el-input
-          v-model="form.balance"
-          placeholder="Please enter balance"
+          v-model="form.depositPaymentForm"
           size="mini"
           clearable
-          style="width: 40%"
+          placeholder="提示输入:after booking"
+          style="width: 170px"
         >
-          <template slot="append">% balance</template>
         </el-input>
+      </el-form-item>
+      <el-form-item label="" label-width="120px">
         <el-input
-          style="width: 30%"
-          v-model="form.balancePaymentType"
+          v-model="form.balance"
           size="mini"
           clearable
+          style="width: 200px"
         >
-          <template slot="append">paid</template>
+          <template slot="prepend">Balance</template>
+          <template slot="append">%</template>
         </el-input>
+
         <el-input
-          style="width: 30%"
           v-model="form.balanceDays"
           size="mini"
           clearable
+          style="width: 130px"
         >
           <template slot="append">Days</template>
         </el-input>
 
-        <el-radio-group v-model="form.balancePaymentForm">
-          <el-radio :label="'Before arrive'">Before arrive</el-radio>
-          <el-radio :label="'After arrival'">After arrival</el-radio>
-        </el-radio-group>
+        <el-select v-model="form.balancePaymentForm" clearable>
+          <el-option label="Before arrive" value="Before arrive"></el-option>
+          <el-option label="After arrival" value="After arrival"></el-option>
+        </el-select>
+
+        <el-row>
+          <el-input
+            style="width: 150px; margin-top: 15px"
+            v-model="form.balancePaymentType"
+            size="mini"
+            clearable
+          >
+            <template slot="append">paid</template>
+          </el-input>
+        </el-row>
+        <el-row>
+          <el-input v-model="form.otherPaymentTerm" size="mini" clearable>
+          </el-input>
+        </el-row>
       </el-form-item>
 
       <el-form-item label="Loading Country/Region">
@@ -709,6 +725,8 @@
           placeholder="请输入标题"
         ></el-input>
         <el-input
+          type="textarea"
+          autosize
           style="width: 75%"
           v-model="item.content"
           placeholder="请输入内容"
@@ -1001,7 +1019,9 @@ export default {
     confirmCompany(companyList, type) {
       var company = companyList[0];
       company.email =
-        company.email && company.email.length > 0 ? company.email[0] : "";
+        company.email && company.email.length > 0
+          ? company.email.join(",")
+          : "";
       company.phoneNumber =
         company.phoneNumber && company.phoneNumber.length > 0
           ? company.phoneNumber[0]

package/packages/src/views/biz/contractTracing/contractPdf.vue

@@ -208,12 +208,27 @@
             {{ contract.freightTerms }}
           </el-descriptions-item>
           <el-descriptions-item label="Payment Terms">
-            Deposit Ratio {{ contract.deposit }}%
-            {{ contract.depositDays }} Days after the contract
-            {{ contract.balance }}% balance
-            {{ contract.balancePaymentType }}paid
-            {{ contract.balanceDays }} Days
-            {{ contract.balancePaymentForm }}
+            <div
+              v-if="
+                contract.deposit &&
+                contract.depositDays &&
+                contract.depositPaymentForm &&
+                contract.balance &&
+                contract.balanceDays &&
+                contract.balancePaymentType &&
+                contract.balancePaymentForm
+              "
+            >
+              Deposit Ratio {{ contract.deposit }}%
+              {{ contract.depositDays }} Days
+              {{ contract.depositPaymentForm }} and {{ contract.balance }}%
+              balance {{ contract.balancePaymentType }} paid
+              {{ contract.balanceDays }} Days {{ contract.balancePaymentForm }}
+              {{ contract.otherPaymentTerm }}
+            </div>
+            <div v-else>
+              {{ contract.otherPaymentTerm }}
+            </div>
           </el-descriptions-item>
           <el-descriptions-item label="Price Fixing Option">
             {{ contract.livePriceDays }} Days {{ contract.livePriceForm }} cargo

package/packages/src/views/biz/contractTracing/contractSummary.vue

@@ -601,7 +601,6 @@
                 class-name="small-padding fixed-width"
                 width="150px"
               >
-               查看物流？
               </el-table-column>
             </el-table>
 

package/packages/src/views/biz/contractTracing/contractTracingDetail.vue

@@ -2,7 +2,7 @@
  * @Author: zhangpengwei 15038779532@163.com
  * @Date: 2023-07-20 17:13:54
  * @LastEditors: zhangpengwei 15038779532@163.com
- * @LastEditTime: 2023-08-04 14:41:11
+ * @LastEditTime: 2023-08-11 17:50:13
  * @FilePath: /recycle-vue-ui再生博士后台管理/src/views/biz/contractTracing/contractTracingDetail.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -70,6 +70,8 @@ export default {
     this.getContract(contractId);
     const activeName = this.$route.query && this.$route.query.activeName;
     this.activeName = activeName || "first";
+    localStorage.setItem("contractDetail", location.href)
+    location.href
   },
   mounted() {},
   methods: {