|
|
@@ -4,8 +4,11 @@
|
|
|
v-if="loading"
|
|
|
v-loading="true"
|
|
|
class="view-window"
|
|
|
+ element-loading-text="Loading..."
|
|
|
+ element-loading-background="rgba(0, 0, 0, 0.3)"
|
|
|
></div>
|
|
|
<div class="flex fixed-button-area">
|
|
|
+ <!-- <el-button @click="() => generatePDF()">generatePDF</el-button> -->
|
|
|
<el-button
|
|
|
type="info"
|
|
|
@click="formVisible = !formVisible"
|
|
|
@@ -55,19 +58,10 @@
|
|
|
>
|
|
|
<div class="flex start">
|
|
|
<div class="layout-left">
|
|
|
- <el-form-item label="Order Type">
|
|
|
- <!-- <el-select
|
|
|
- v-model="form.Order_Type"
|
|
|
- style="width: 100%"
|
|
|
- placeholder="please select order type"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in orderTypeList"
|
|
|
- :key="index"
|
|
|
- :label="item.label"
|
|
|
- :value="item.label"
|
|
|
- />
|
|
|
- </el-select> -->
|
|
|
+ <el-form-item
|
|
|
+ label="Order Type"
|
|
|
+ label-width="130px"
|
|
|
+ >
|
|
|
<el-radio-group v-model="form.Order_Type">
|
|
|
<el-radio
|
|
|
v-for="(item, index) in orderTypeList"
|
|
|
@@ -81,6 +75,7 @@
|
|
|
<el-form-item
|
|
|
label="Artwork Link"
|
|
|
prop="Artwork_Link"
|
|
|
+ label-width="130px"
|
|
|
>
|
|
|
<el-input
|
|
|
v-model="form.Artwork_Link"
|
|
|
@@ -89,7 +84,10 @@
|
|
|
:rows="3"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="Currency">
|
|
|
+ <el-form-item
|
|
|
+ label="Currency"
|
|
|
+ label-width="130px"
|
|
|
+ >
|
|
|
<el-select
|
|
|
v-model="form.Currency"
|
|
|
style="width: 100%"
|
|
|
@@ -103,6 +101,23 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ v-if="recommandVendor.length"
|
|
|
+ label="Suggest Supplier"
|
|
|
+ label-width="130px"
|
|
|
+ >
|
|
|
+ <div class="flex column start">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in recommandVendor"
|
|
|
+ :key="index"
|
|
|
+ class="btn-quick-vendor"
|
|
|
+ :class="{ active: item.id === form.currentVendor }"
|
|
|
+ @click="quickSelectSupplier(item)"
|
|
|
+ >
|
|
|
+ {{ item.name || '' }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
|
|
|
<div class="layout-right flex-auto">
|
|
|
@@ -114,7 +129,7 @@
|
|
|
@change="onCompanyTemplateChange"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="company in companyList"
|
|
|
+ v-for="company in computedCompanyList"
|
|
|
:key="company.id"
|
|
|
:value="company.id"
|
|
|
:label="company.label"
|
|
|
@@ -156,19 +171,9 @@
|
|
|
label-width="0"
|
|
|
prop="currentVendor"
|
|
|
>
|
|
|
- <!-- <el-select-v2
|
|
|
- v-model="form.currentVendor"
|
|
|
- :remote-method="getSupplierLists"
|
|
|
- remote
|
|
|
- style="width: 100%"
|
|
|
- :loading="vendorLoading"
|
|
|
- :options="vendorList"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- ></el-select-v2> -->
|
|
|
<el-select
|
|
|
v-model="form.currentVendor"
|
|
|
- :remote-method="getSupplierLists"
|
|
|
+ :remote-method="utils.debounce(getSupplierLists, 1000)"
|
|
|
remote
|
|
|
style="width: 100%"
|
|
|
:loading="vendorLoading"
|
|
|
@@ -277,6 +282,9 @@
|
|
|
value-format="YYYY-MM-DD"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="送货备注 :">
|
|
|
+ <el-input v-model="form.Delivery_Details"></el-input>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="product-table-separator"></div>
|
|
|
@@ -286,7 +294,7 @@
|
|
|
cellspacing="0"
|
|
|
>
|
|
|
<tr>
|
|
|
- <th class="product">品目</th>
|
|
|
+ <th class="product">品名</th>
|
|
|
<th class="quantity">数量</th>
|
|
|
<th class="rate">价格</th>
|
|
|
<th class="requirement">中文品目|要求</th>
|
|
|
@@ -323,6 +331,7 @@
|
|
|
></el-select-v2>
|
|
|
</el-form-item>
|
|
|
<el-input
|
|
|
+ v-if="userInfo.Organization !== 'PrimePac'"
|
|
|
v-model="product.desc"
|
|
|
type="textarea"
|
|
|
placeholder="Free text"
|
|
|
@@ -368,7 +377,7 @@
|
|
|
<td class="requirement">
|
|
|
<el-input
|
|
|
v-model="product.requirement"
|
|
|
- rows="2"
|
|
|
+ :rows="userInfo.Organization !== 'PrimePac' ? 4 : 5"
|
|
|
type="textarea"
|
|
|
placeholder="Free text"
|
|
|
></el-input>
|
|
|
@@ -515,12 +524,130 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</template>
|
|
|
+ <template
|
|
|
+ v-if="['PrimePacCommon', 'PrimePacSoft'].includes(currentCompany)"
|
|
|
+ >
|
|
|
+ <div class="rule-item">
|
|
|
+ 一、本采购订单签署原件一式两份，双方各持一份。经双方代表签字或盖章即可生效，并具有同等法律效力。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item flex nowrap">
|
|
|
+ 二、以上价格已含所有产品的制作费、包装费；由
|
|
|
+ <span style="color: #f56c6c">*</span>
|
|
|
+ <el-form-item label-width="10">
|
|
|
+ <el-select
|
|
|
+ v-model="form.field5"
|
|
|
+ size="small"
|
|
|
+ style="width: 110px"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in field5_lists"
|
|
|
+ :key="index"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.label"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ 运费送货到广州甲方指定的卸货地点，不含税，运费届时实报实销。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 三、印刷及工艺要求：乙方需按照甲方图稿或指定样品进行生产，颜色对照潘通色卡或指定样品。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 四、付款形式：
|
|
|
+ <span>{{ form.Supplier_Payment_Terms }}</span>
|
|
|
+ 。甲方在乙方完成大货时，先寄大货样品给乙方确认，确认后付清剩余尾款。甲方通过银行转帐的方式付款，乙方账户信息如上。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 五、出货标准：五层出口空白硬纸箱，箱内套防潮袋。如实际出货包装与合约要求不符，甲方有权拒收整批货物。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 六、订货时间：自合同成立，甲方支付定金并确认图稿后算起。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 七、交货期限：自确认图稿时间算起，乙方应于
|
|
|
+ <span>{{ form.field6 }}</span>
|
|
|
+ 前生产好产品，甲方确认并支付剩余款项后，乙方在约定时间内安排发出剩余产品到甲方收货地址。
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<div
|
|
|
v-for="(item, index) in currentServiceRule"
|
|
|
:key="index"
|
|
|
class="rule-item"
|
|
|
+ :class="[{ sub: typeof item === 'object' }]"
|
|
|
+ v-html="typeof item === 'object' ? item.value : item"
|
|
|
+ ></div>
|
|
|
+
|
|
|
+ <div
|
|
|
+ v-if="currentCompany === 'PrimePacCommon'"
|
|
|
+ class="flex stretch PrimePac-table"
|
|
|
>
|
|
|
- {{ item }}
|
|
|
+ <div class="flex column stretch">
|
|
|
+ <div class="column-item flex center">制作要求</div>
|
|
|
+ <div class="flex-auto column-item flex center">
|
|
|
+ 产品外观要求
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="flex-auto flex column stretch">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in PrimePacCommonRuleTableData"
|
|
|
+ :key="index"
|
|
|
+ class="flex stretch flex-auto"
|
|
|
+ >
|
|
|
+ <div class="column-item flex center">
|
|
|
+ {{ item.project }}
|
|
|
+ </div>
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ {{ item.method }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div
|
|
|
+ v-if="currentCompany === 'PrimePacSoft'"
|
|
|
+ class="flex column stretch PrimePac-table"
|
|
|
+ >
|
|
|
+ <div class="flex stretch">
|
|
|
+ <div class="flex column stretch">
|
|
|
+ <div class="column-item flex-auto flex center">制作要求</div>
|
|
|
+ </div>
|
|
|
+ <div class="flex-auto flex column stretch">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in PrimePacSoftRuleTableData1"
|
|
|
+ :key="index"
|
|
|
+ class="flex stretch flex-auto"
|
|
|
+ >
|
|
|
+ <div class="column-item flex center">
|
|
|
+ {{ item.project }}
|
|
|
+ </div>
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ {{ item.method }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div class="flex stretch">
|
|
|
+ <div class="flex column stretch">
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ 产品技术要求
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="flex-auto flex column stretch">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in PrimePacSoftRuleTableData2"
|
|
|
+ :key="index"
|
|
|
+ class="flex stretch flex-auto"
|
|
|
+ >
|
|
|
+ <div class="column-item flex center">
|
|
|
+ {{ item.project }}
|
|
|
+ </div>
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ {{ item.method }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -660,6 +787,13 @@
|
|
|
{{ form.field6 }}
|
|
|
</div>
|
|
|
</div>
|
|
|
+
|
|
|
+ <div class="flex">
|
|
|
+ <div class="column-form-label">送货备注 :</div>
|
|
|
+ <div class="column-form-value">
|
|
|
+ {{ form.Delivery_Details }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="product-table-separator"></div>
|
|
|
@@ -670,8 +804,10 @@
|
|
|
>
|
|
|
<tr>
|
|
|
<th class="row-index">#</th>
|
|
|
- <th>品目</th>
|
|
|
- <th>中文品目|要求</th>
|
|
|
+ <th>品名</th>
|
|
|
+ <th v-if="userInfo.Organization !== 'PrimePac'">
|
|
|
+ 中文品目|要求
|
|
|
+ </th>
|
|
|
<th>数量</th>
|
|
|
<th>价格</th>
|
|
|
<th>金额</th>
|
|
|
@@ -682,10 +818,21 @@
|
|
|
>
|
|
|
<td class="row-index">{{ index + 1 }}.</td>
|
|
|
<td>
|
|
|
- <div>{{ product.name }}</div>
|
|
|
- <div class="desc">{{ product.desc }}</div>
|
|
|
+ <div class="product-name">{{ product.name }}</div>
|
|
|
+ <div
|
|
|
+ v-if="userInfo.Organization !== 'PrimePac'"
|
|
|
+ class="desc"
|
|
|
+ >
|
|
|
+ {{ product.desc }}
|
|
|
+ </div>
|
|
|
+ <div
|
|
|
+ v-else
|
|
|
+ class="desc"
|
|
|
+ >
|
|
|
+ {{ product.requirement }}
|
|
|
+ </div>
|
|
|
</td>
|
|
|
- <td>
|
|
|
+ <td v-if="userInfo.Organization !== 'PrimePac'">
|
|
|
{{ product.requirement }}
|
|
|
</td>
|
|
|
<td>
|
|
|
@@ -758,14 +905,115 @@
|
|
|
</div>
|
|
|
<div class="rule-item">二、运费条款: {{ form.field5 }}</div>
|
|
|
</template>
|
|
|
+ <template
|
|
|
+ v-if="['PrimePacCommon', 'PrimePacSoft'].includes(currentCompany)"
|
|
|
+ >
|
|
|
+ <div class="rule-item">
|
|
|
+ 一、本采购订单签署原件一式两份，双方各持一份。经双方代表签字或盖章即可生效，并具有同等法律效力。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item flex nowrap">
|
|
|
+ 二、以上价格已含所有产品的制作费、包装费；由
|
|
|
+ <span>{{ form.field5 }}</span>
|
|
|
+ 运费送货到广州甲方指定的卸货地点，不含税，运费届时实报实销。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 三、印刷及工艺要求：乙方需按照甲方图稿或指定样品进行生产，颜色对照潘通色卡或指定样品。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 四、付款形式：
|
|
|
+ <span>{{ form.Supplier_Payment_Terms }}</span>
|
|
|
+ 。甲方在乙方完成大货时，先寄大货样品给乙方确认，确认后付清剩余尾款。甲方通过银行转帐的方式付款，乙方账户信息如上。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 五、出货标准：五层出口空白硬纸箱，箱内套防潮袋。如实际出货包装与合约要求不符，甲方有权拒收整批货物。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 六、订货时间：自合同成立，甲方支付定金并确认图稿后算起。
|
|
|
+ </div>
|
|
|
+ <div class="rule-item">
|
|
|
+ 七、交货期限：自确认图稿时间算起，乙方应于
|
|
|
+ <span>{{ form.field6 }}</span>
|
|
|
+ 前生产好产品，甲方确认并支付剩余款项后，乙方在约定时间内安排发出剩余产品到甲方收货地址。
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<div
|
|
|
v-for="(item, index) in currentServiceRule"
|
|
|
:key="index"
|
|
|
class="rule-item"
|
|
|
+ :class="[{ sub: typeof item === 'object' }]"
|
|
|
+ v-html="typeof item === 'object' ? item.value : item"
|
|
|
+ ></div>
|
|
|
+
|
|
|
+ <div
|
|
|
+ v-if="currentCompany === 'PrimePacCommon'"
|
|
|
+ class="flex stretch PrimePac-table"
|
|
|
>
|
|
|
- {{ item }}
|
|
|
+ <div class="flex column stretch">
|
|
|
+ <div class="column-item flex center">制作要求</div>
|
|
|
+ <div class="flex-auto column-item flex center">产品外观要求</div>
|
|
|
+ </div>
|
|
|
+ <div class="flex-auto flex column stretch">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in PrimePacCommonRuleTableData"
|
|
|
+ :key="index"
|
|
|
+ class="flex stretch flex-auto"
|
|
|
+ >
|
|
|
+ <div class="column-item flex center">
|
|
|
+ {{ item.project }}
|
|
|
+ </div>
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ {{ item.method }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
|
|
|
+ <div
|
|
|
+ v-if="currentCompany === 'PrimePacSoft'"
|
|
|
+ class="flex column stretch PrimePac-table"
|
|
|
+ >
|
|
|
+ <div class="flex stretch">
|
|
|
+ <div class="flex column stretch">
|
|
|
+ <div class="column-item flex-auto flex center">制作要求</div>
|
|
|
+ </div>
|
|
|
+ <div class="flex-auto flex column stretch">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in PrimePacSoftRuleTableData1"
|
|
|
+ :key="index"
|
|
|
+ class="flex stretch flex-auto"
|
|
|
+ >
|
|
|
+ <div class="column-item flex center">
|
|
|
+ {{ item.project }}
|
|
|
+ </div>
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ {{ item.method }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <div class="flex stretch">
|
|
|
+ <div class="flex column stretch">
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ 产品技术要求
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="flex-auto flex column stretch">
|
|
|
+ <div
|
|
|
+ v-for="(item, index) in PrimePacSoftRuleTableData2"
|
|
|
+ :key="index"
|
|
|
+ class="flex stretch flex-auto"
|
|
|
+ >
|
|
|
+ <div class="column-item flex center">
|
|
|
+ {{ item.project }}
|
|
|
+ </div>
|
|
|
+ <div class="column-item flex-auto flex center">
|
|
|
+ {{ item.method }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<br />
|
|
|
<div class="signature-area">
|
|
|
<div class="company-seal"></div>
|
|
|
@@ -1056,6 +1304,7 @@ import {
|
|
|
IUser,
|
|
|
ICompanyItem,
|
|
|
IVendorItem,
|
|
|
+ IRecommandVendor,
|
|
|
IForm,
|
|
|
} from '@/interface'
|
|
|
|
|
|
@@ -1136,7 +1385,7 @@ const generatePDF = (ele = pdfElement, isFirstTime = true) => {
|
|
|
|
|
|
// let pageHeight = (imageWrapper.scrollWidth / A4_WIDTH) * A4_HEIGHT
|
|
|
let pageHeight = (imageWrapper.clientWidth / A4_WIDTH) * A4_HEIGHT
|
|
|
- let lableListID = imageWrapper.querySelectorAll('div')
|
|
|
+ let lableListID = imageWrapper.querySelectorAll('#pdfElement > div')
|
|
|
// 进行分割操作，当dom内容已超出a4的高度，则将该dom前插入一个空dom，把他挤下去，分割
|
|
|
for (let i = 0; i < lableListID.length; i++) {
|
|
|
let multiple = Math.ceil(
|
|
|
@@ -1151,7 +1400,7 @@ const generatePDF = (ele = pdfElement, isFirstTime = true) => {
|
|
|
multiple * pageHeight -
|
|
|
(lableListID[i].offsetTop + lableListID[i].offsetHeight)
|
|
|
//留白
|
|
|
- newNode.style.height = _H + 30 + 'px'
|
|
|
+ newNode.style.height = _H + 40 + 'px'
|
|
|
newNode.style.width = '100%'
|
|
|
let next = lableListID[i].nextSibling // 获取div的下一个兄弟节点
|
|
|
// 判断兄弟节点是否存在
|
|
|
@@ -1403,7 +1652,6 @@ const getPurchaseOrdersData = function () {
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
-// getPurchaseOrdersData()
|
|
|
|
|
|
const currencyList = ref([
|
|
|
{
|
|
|
@@ -1501,6 +1749,7 @@ const form = ref<IForm>({
|
|
|
// 运费条款
|
|
|
field5: '供应商承担',
|
|
|
currentVendor: '',
|
|
|
+ Delivery_Details: '',
|
|
|
})
|
|
|
|
|
|
const formRule = ref<FormRules>({
|
|
|
@@ -1694,41 +1943,53 @@ watch(computedVendor, () => {
|
|
|
})
|
|
|
|
|
|
const vendorLoading = ref(false)
|
|
|
-const getSupplierLists = utils.debounce(function (string: string) {
|
|
|
- const keyword = string.trim()
|
|
|
- if (!keyword.length) return
|
|
|
+const getSupplierLists = function (string: string) {
|
|
|
+ return new Promise((resolve, reject) => {
|
|
|
+ // 这个处理是为了兼容下拉框的实时防抖搜索 和 ((点击推荐供应商)快速勾选 的搜索)
|
|
|
+ const keyword = string.trim() || form.value.currentVendor?.trim() || ''
|
|
|
+ if (!keyword.length) {
|
|
|
+ reject('false')
|
|
|
+ return
|
|
|
+ }
|
|
|
+ const data = {
|
|
|
+ value: keyword,
|
|
|
+ name: 'Vendors',
|
|
|
+ api_name: 'Vendor_Name',
|
|
|
+ contains: 'contains',
|
|
|
+ page: 1,
|
|
|
+ limit: 100,
|
|
|
+ }
|
|
|
+ console.log('get supp run')
|
|
|
+ vendorLoading.value = true
|
|
|
+ getSearchData(data)
|
|
|
+ .then((response) => {
|
|
|
+ if (response.data.code !== 1) return false
|
|
|
+ const res = response.data.result || { data: [] }
|
|
|
+ vendorList.value = res.data
|
|
|
+ .filter((i: any) => !i.Hide_Record)
|
|
|
+ .map((i: any) => {
|
|
|
+ return {
|
|
|
+ ...i,
|
|
|
+ label: i.Suppliers_Name || i.Vendor_Name,
|
|
|
+ value: i.supplier_id || i.id,
|
|
|
+ Primary_Contact_name: i.Primary_Contact_name || '',
|
|
|
+ PDF_display: i.PDF_display || '',
|
|
|
+ PDF_display2: i.PDF_display2 || '',
|
|
|
+ }
|
|
|
+ })
|
|
|
+ vendorLoading.value = false
|
|
|
+ loading.value = false
|
|
|
+ resolve(true)
|
|
|
+ })
|
|
|
+ .catch((e) => reject(e))
|
|
|
+ })
|
|
|
+}
|
|
|
|
|
|
- const data = {
|
|
|
- value: keyword,
|
|
|
- name: 'Vendors',
|
|
|
- api_name: 'Vendor_Name',
|
|
|
- contains: 'contains',
|
|
|
- page: 1,
|
|
|
- limit: 100,
|
|
|
- }
|
|
|
- vendorLoading.value = true
|
|
|
- getSearchData(data)
|
|
|
- .then((response) => {
|
|
|
- if (response.data.code !== 1) return
|
|
|
- const res = response.data.result
|
|
|
- vendorList.value = res.data
|
|
|
- .filter((i: any) => !i.Hide_Record)
|
|
|
- .map((i: any) => {
|
|
|
- return {
|
|
|
- ...i,
|
|
|
- label: i.Suppliers_Name || i.Vendor_Name,
|
|
|
- value: i.supplier_id || i.id,
|
|
|
- Primary_Contact_name: i.Primary_Contact_name || '',
|
|
|
- PDF_display: i.PDF_display || '',
|
|
|
- PDF_display2: i.PDF_display2 || '',
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
- .finally(() => {
|
|
|
- vendorLoading.value = false
|
|
|
- })
|
|
|
-}, 1000)
|
|
|
-getSupplierLists('')
|
|
|
+const quickSelectSupplier = function (item: IRecommandVendor) {
|
|
|
+ form.value.currentVendor = item.id
|
|
|
+ loading.value = true
|
|
|
+ getSupplierLists(item.name)
|
|
|
+}
|
|
|
|
|
|
const getSearchData = async function (p: any) {
|
|
|
return await request
|
|
|
@@ -1743,7 +2004,7 @@ const getSearchData = async function (p: any) {
|
|
|
const getPath = function (path: string) {
|
|
|
return new URL(path, import.meta.url).href
|
|
|
}
|
|
|
-// 用于切换合同模版
|
|
|
+// 用于切换合同模版. Promo Collection 用户组使用.
|
|
|
const companyList = ref<ICompanyItem[]>([
|
|
|
{
|
|
|
id: 'PC',
|
|
|
@@ -1792,6 +2053,32 @@ const companyList = ref<ICompanyItem[]>([
|
|
|
signPath: getPath('/assets/sign/FOT.png'),
|
|
|
},
|
|
|
])
|
|
|
+
|
|
|
+// 用于切换合同模版. PrimePac 用户组的模版
|
|
|
+const PrimePacList = ref<ICompanyItem[]>([
|
|
|
+ {
|
|
|
+ id: 'PrimePacCommon',
|
|
|
+ label: 'PrimePac Purchase order 通用版',
|
|
|
+ name: '澳之原贸易有限公司',
|
|
|
+ addr: 'UNIT 12,21/F WAYSON COMM BLDG NO 28 CONNAUGHT RD WEST SHEUNG WAN,HK',
|
|
|
+ phone: '020-81609790',
|
|
|
+ signPath: getPath('/assets/sign/AZY.png'),
|
|
|
+ },
|
|
|
+ {
|
|
|
+ id: 'PrimePacSoft',
|
|
|
+ label: 'PrimePac Purchase order 软包版',
|
|
|
+ name: '澳之原贸易有限公司',
|
|
|
+ addr: 'UNIT 12,21/F WAYSON COMM BLDG NO 28 CONNAUGHT RD WEST SHEUNG WAN,HK',
|
|
|
+ phone: '020-81609790',
|
|
|
+ signPath: getPath('/assets/sign/AZY.png'),
|
|
|
+ },
|
|
|
+])
|
|
|
+
|
|
|
+const computedCompanyList = computed(() => {
|
|
|
+ return userInfo.value.Organization === 'PrimePac'
|
|
|
+ ? PrimePacList.value
|
|
|
+ : companyList.value
|
|
|
+})
|
|
|
// 切换模版后的处理
|
|
|
const onCompanyTemplateChange = function () {
|
|
|
// 重置这两个字段
|
|
|
@@ -1865,15 +2152,45 @@ const serviceRule = ref<TypeService>({
|
|
|
'六、如因未能按上述标准及期限交货而产生经济损失，将由乙方承担。',
|
|
|
'七、凡因执行本合同所发生的或与本合同有关的一切争议，如经友好协商不能解决时，交由广州当地法院进行判决。',
|
|
|
],
|
|
|
+ PrimePacCommon: [
|
|
|
+ '八、质量承诺：如甲方自收到货品之日起一个月内发现货品存在不符合合同约定的瑕疵，乙方应无条件包退包换，承担违约责任。承担违约需双方进行协商，达成解决方案。',
|
|
|
+ '九、如因未能按上述标准及期限交货而产生经济损失，将由乙方承担。',
|
|
|
+ '十、其他事项：',
|
|
|
+ {
|
|
|
+ value:
|
|
|
+ '1. 乙方应确保最终实际生产数量在合约确定数量±5%以内，同时提供一定数量的备品用于更换运输途中可能出现的损坏品。',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value:
|
|
|
+ '2. 乙方若预计交货时间将出现延误，应立刻通知甲方，与甲方另行约定发货时间并得到甲方确认。如乙方无法确定时间或再度延期，并未告知甲方合理延期原因，甲方有权要求乙方承当相应的违约责任并赔偿甲方相应损失。',
|
|
|
+ },
|
|
|
+ '十一、凡因执行本合同所发生的或与本合同有关的一切争议，如经友好协商不能解决时，交由广州当地法院进行判决。',
|
|
|
+ '附录：',
|
|
|
+ '产品制作要求及质量检验标准：',
|
|
|
+ {
|
|
|
+ value:
|
|
|
+ '1、乙方必须严格按甲方要求或产品销售国家/产品出口国最新的相关国家、行业标准对产品质量进行监控和检验。如在现场检验中发现乙方提供的产品不符合合同约定或与样板不符，乙方应在甲方要求的期限内补足、更换。补足、更换后的产品应符合合同要求。',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value:
|
|
|
+ '2、出货前甲方对合同项下产品按GB/T2828.1—2012抽样方法进行抽检，采用Ⅱ级检验水准，AQL值为：严重质量缺陷=1.0，重要质量缺陷=2.5，轻微质量缺陷=4.0 作为标准, 若检验不合格，甲方有权拒收整批货品。乙方应及时采取有效的措施补救，确保合同项下产品在合同交货期内按质、按量交货。如发生延误，则按本合同第七条的约定处理。',
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ PrimePacSoft: [], // 跟 PrimePacCommon 完全相同
|
|
|
})
|
|
|
const currentServiceRule = computed(() => {
|
|
|
+ if (currentCompany.value === 'PrimePacSoft') {
|
|
|
+ return serviceRule.value['PrimePacCommon']
|
|
|
+ }
|
|
|
return serviceRule.value[currentCompany.value as ServiceTypeKeyEnum]
|
|
|
})
|
|
|
|
|
|
const currentCompany = ref('PC')
|
|
|
const computedCompany = computed(() => {
|
|
|
- const result = companyList.value.filter((i) => i.id === currentCompany.value)
|
|
|
- return result.length ? result[0] : companyList.value[0]
|
|
|
+ const result = computedCompanyList.value.filter(
|
|
|
+ (i) => i.id === currentCompany.value,
|
|
|
+ )
|
|
|
+ return result.length ? result[0] : computedCompanyList.value[0]
|
|
|
})
|
|
|
// 格式化输出价格的小数位数. 退税版需要显示三位小数, 其他只需要两位小数
|
|
|
const computedDeci = computed(() => {
|
|
|
@@ -1933,8 +2250,80 @@ const soOwner = ref('')
|
|
|
const p2 = request
|
|
|
.post('/common/getSalesOrdersData', { id: route.params.id })
|
|
|
.then((response) => {
|
|
|
- if (response.data.code !== 1) return
|
|
|
- const res = response.data.result
|
|
|
+ return response
|
|
|
+ })
|
|
|
+
|
|
|
+// 获取对 该so对应客户的标注 并弹窗提醒
|
|
|
+const getAccountsData = async (id: string) =>
|
|
|
+ request.post('/common/getAccountsData', { id }).then((response) => {
|
|
|
+ const res = response.data
|
|
|
+ if (res.code !== 1) return
|
|
|
+ if (res.result.User_Notes && res.result.User_Notes.length) {
|
|
|
+ ElMessageBox.alert(res.result.User_Notes, '', {
|
|
|
+ showClose: false,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+const getProductData = async (id: string) =>
|
|
|
+ request.post('/common/getProductsData', { id }).then((response) => {
|
|
|
+ const res = response.data
|
|
|
+ if (res.code !== 1) return
|
|
|
+ // console.log(res.result)
|
|
|
+ if (userInfo.value.Organization === 'PrimePac') {
|
|
|
+ return '产品名称：\n尺寸：\n材质：\n工艺：\n颜色：\n其他备注：'
|
|
|
+ } else {
|
|
|
+ return res.result?.CF3 || ''
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+const recommandVendor = ref<IRecommandVendor[]>([])
|
|
|
+const getRecommamdSupplier = async (id: string) =>
|
|
|
+ request.post('/common/getProductsOftenLists', { id }).then((response) => {
|
|
|
+ const res = response.data
|
|
|
+ if (res.code !== 1) return
|
|
|
+ recommandVendor.value = recommandVendor.value.concat(
|
|
|
+ Array.isArray(res.result) ? res.result : [],
|
|
|
+ )
|
|
|
+ })
|
|
|
+// 根据url传递过来的用户ID获取的用户身份信息
|
|
|
+const userInfo = ref({} as IUser)
|
|
|
+const p3 = request
|
|
|
+ .post('/common/getUsersData', { id: route.query.user })
|
|
|
+ .then((response) => {
|
|
|
+ const res = response.data
|
|
|
+ if (res.code !== 1) return
|
|
|
+
|
|
|
+ if (res.result.users && res.result.users.length) {
|
|
|
+ userInfo.value = res.result.users[0]
|
|
|
+ } else if (res.result.id) {
|
|
|
+ userInfo.value = res.result || {}
|
|
|
+ } else if (Array.isArray(res.result) && res.result.length) {
|
|
|
+ userInfo.value = res.result[0] || {}
|
|
|
+ } else {
|
|
|
+ ElMessage.error('获取当前用户身份异常, 请联系管理员')
|
|
|
+ }
|
|
|
+
|
|
|
+ // 根据用户 ‘组织’ 切换模版默认选中项
|
|
|
+ if (userInfo.value.Organization === 'PrimePac') {
|
|
|
+ currentCompany.value = 'PrimePacCommon'
|
|
|
+ } else {
|
|
|
+ currentCompany.value = 'PC'
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+Promise.all([
|
|
|
+ p1,
|
|
|
+ p2,
|
|
|
+ p3,
|
|
|
+ getAccountsData,
|
|
|
+ getRecommamdSupplier(route.params.id as string),
|
|
|
+])
|
|
|
+ .then((array: any[]) => {
|
|
|
+ // console.log(array, 'all res')
|
|
|
+ // p2的数据处理逻辑从原本的p2then移动到这里处理.
|
|
|
+ // 因为要根据p3用户数据的Organization 来填充产品列表里面的 requirement, 这步处理必须放在p3后面, 而p2 p3是并发操作.
|
|
|
+ if (array[1].data.code !== 1) return
|
|
|
+ const res = array[1].data.result
|
|
|
if (res.Account_Name && res.Account_Name.id) {
|
|
|
getAccountsData(res.Account_Name.id)
|
|
|
}
|
|
|
@@ -1983,48 +2372,93 @@ const p2 = request
|
|
|
})
|
|
|
})
|
|
|
})
|
|
|
-
|
|
|
-// 获取对 该so对应客户的标注 并弹窗提醒
|
|
|
-const getAccountsData = async (id: string) =>
|
|
|
- request.post('/common/getAccountsData', { id }).then((response) => {
|
|
|
- const res = response.data
|
|
|
- if (res.code !== 1) return
|
|
|
- if (res.result.User_Notes && res.result.User_Notes.length) {
|
|
|
- ElMessageBox.alert(res.result.User_Notes, '', {
|
|
|
- showClose: false,
|
|
|
- })
|
|
|
- }
|
|
|
+ .finally(() => {
|
|
|
+ loading.value = false
|
|
|
})
|
|
|
-const getProductData = async (id: string) =>
|
|
|
- request.post('/common/getProductsData', { id }).then((response) => {
|
|
|
- const res = response.data
|
|
|
- if (res.code !== 1) return
|
|
|
- // console.log(res.result)
|
|
|
- return res.result?.CF3 || ''
|
|
|
- })
|
|
|
-
|
|
|
-// 根据url传递过来的用户ID获取的用户身份信息
|
|
|
-const userInfo = ref({} as IUser)
|
|
|
-const p3 = request
|
|
|
- .post('/common/getUsersData', { id: route.query.user })
|
|
|
- .then((response) => {
|
|
|
- const res = response.data
|
|
|
- if (res.code !== 1) return
|
|
|
|
|
|
- if (res.result.users && res.result.users.length) {
|
|
|
- userInfo.value = res.result.users[0]
|
|
|
- } else if (res.result.id) {
|
|
|
- userInfo.value = res.result || {}
|
|
|
- } else if (Array.isArray(res.result) && res.result.length) {
|
|
|
- userInfo.value = res.result[0] || {}
|
|
|
- } else {
|
|
|
- ElMessage.error('获取当前用户身份异常, 请联系管理员')
|
|
|
- }
|
|
|
- })
|
|
|
+interface PrimePacTable {
|
|
|
+ project: string
|
|
|
+ method: string
|
|
|
+}
|
|
|
|
|
|
-Promise.all([p1, p2, p3, getAccountsData]).finally(() => {
|
|
|
- loading.value = false
|
|
|
-})
|
|
|
+const PrimePacCommonRuleTableData = [
|
|
|
+ {
|
|
|
+ project: '检验项目',
|
|
|
+ method: '产品质量检测方法与标准',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '尺寸',
|
|
|
+ method: '参考上述产品尺寸',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '印刷',
|
|
|
+ method:
|
|
|
+ '1、成品整洁，无明显印刷瑕疵范畴的脏污、残缺、刀丝；\n2、文字印刷清晰完整，印迹边缘光洁，渐变区域清晰均匀；\n3、无明显变形和残缺，套印基本准确，同色之间基本无色差；',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '复合',
|
|
|
+ method: '无明显气泡，无分层',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '表面',
|
|
|
+ method: '平整，无明显气泡，无刮花，无明显溢胶',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '其他',
|
|
|
+ method: '不允许出现划伤、烫伤、穿孔、异味、粘连异物、脏污',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '特殊',
|
|
|
+ method: '/',
|
|
|
+ },
|
|
|
+]
|
|
|
+// 软包版表格数据
|
|
|
+const PrimePacSoftRuleTableData1: PrimePacTable[] = [
|
|
|
+ {
|
|
|
+ project: '检验项目',
|
|
|
+ method: '产品质量检测方法与标准',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '印刷',
|
|
|
+ method:
|
|
|
+ '1、成品整洁，无明显印刷瑕疵范畴的脏污、残缺、刀丝；\n2、文字印刷清晰完整，印迹边缘光洁，渐变区域清晰均匀；\n3、无明显变形和残缺，套印基本准确，同色之间基本无色差；\n4、与颜色标准无明显色差（将提供明确的颜色标准）',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '复合',
|
|
|
+ method: '无明显气泡，无分层',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '热封',
|
|
|
+ method: '平整，无虚封，无明显气泡',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '其他',
|
|
|
+ method: '不允许出现划伤、烫伤、穿孔、异味、粘连异物、脏污',
|
|
|
+ },
|
|
|
+]
|
|
|
+const PrimePacSoftRuleTableData2: PrimePacTable[] = [
|
|
|
+ {
|
|
|
+ project: '溶剂残留量',
|
|
|
+ method:
|
|
|
+ '按照GB/T 10004的6.6.17条规定执行\n总溶剂残留量≤10mg/m2\n苯系溶剂残留量≤2mg/m2',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '复合强度',
|
|
|
+ method: '按照GB/T 8808的规定执行\n≥1.0 N/15mm',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '热封强度',
|
|
|
+ method: '按照GB/T 2358的规定执行\n≥20 N/15mm',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '耐压性能',
|
|
|
+ method: '按照GB/T 10004的6.6.8条规定执行\n120N下无渗漏，无破裂',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ project: '熟化时间',
|
|
|
+ method: '熟化时间不少于48小时',
|
|
|
+ },
|
|
|
+]
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
|
@@ -2094,7 +2528,7 @@ input[type='number'] {
|
|
|
.layout-left {
|
|
|
width: 435px;
|
|
|
min-width: 435px;
|
|
|
- padding-right: 24px;
|
|
|
+ padding-right: 12px;
|
|
|
}
|
|
|
.layout-right {
|
|
|
position: relative;
|
|
|
@@ -2103,10 +2537,47 @@ input[type='number'] {
|
|
|
}
|
|
|
|
|
|
.rule-item {
|
|
|
+ margin-bottom: 2px;
|
|
|
+ color: $subColor;
|
|
|
+ line-height: 26pt;
|
|
|
+ &.sub {
|
|
|
+ line-height: 20pt;
|
|
|
+ padding-left: 24px;
|
|
|
+ }
|
|
|
+ &.nowrap {
|
|
|
+ white-space: nowrap;
|
|
|
+ }
|
|
|
.el-form-item {
|
|
|
margin-bottom: 0;
|
|
|
}
|
|
|
}
|
|
|
+.btn-quick-vendor {
|
|
|
+ border: 1px solid #dcdfe6;
|
|
|
+ border-radius: 4px;
|
|
|
+ cursor: pointer;
|
|
|
+ padding: 0 8px;
|
|
|
+ margin-bottom: 6px;
|
|
|
+ &.active {
|
|
|
+ color: #fff;
|
|
|
+ background-color: #409eff;
|
|
|
+ }
|
|
|
+}
|
|
|
+.PrimePac-table {
|
|
|
+ margin: 12px auto;
|
|
|
+ width: 100%;
|
|
|
+ border-bottom: 1px solid #dcdfe6;
|
|
|
+ border-right: 1px solid #dcdfe6;
|
|
|
+ .column-item {
|
|
|
+ color: $subColor;
|
|
|
+ white-space: pre-wrap;
|
|
|
+ padding: 0 4px;
|
|
|
+ line-height: 20pt;
|
|
|
+ min-width: 120px;
|
|
|
+ min-height: 20pt;
|
|
|
+ border-top: 1px solid #dcdfe6;
|
|
|
+ border-left: 1px solid #dcdfe6;
|
|
|
+ }
|
|
|
+}
|
|
|
|
|
|
.sign-wrap {
|
|
|
width: 100pt;
|
|
|
@@ -2117,6 +2588,7 @@ input[type='number'] {
|
|
|
width: 100%;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.screen {
|
|
|
background-color: rgba(#fff, 1);
|
|
|
box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.4) inset,
|
|
|
@@ -2245,10 +2717,6 @@ input[type='number'] {
|
|
|
.note-form-area {
|
|
|
width: 40%;
|
|
|
}
|
|
|
- .rule-item {
|
|
|
- color: $subColor;
|
|
|
- line-height: 26pt;
|
|
|
- }
|
|
|
.sub-form-title {
|
|
|
padding-left: 4pt;
|
|
|
border-left: 2pt solid #efefef;
|
|
|
@@ -2374,6 +2842,10 @@ input[type='number'] {
|
|
|
min-width: 20pt;
|
|
|
max-width: 100pt;
|
|
|
padding: 0 2pt;
|
|
|
+ white-space: pre-wrap;
|
|
|
+ .product-name {
|
|
|
+ font-weight: bold;
|
|
|
+ }
|
|
|
.desc {
|
|
|
white-space: pre-wrap;
|
|
|
line-height: 16pt;
|
|
|
@@ -2407,10 +2879,6 @@ input[type='number'] {
|
|
|
color: $subColor;
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
- .rule-item {
|
|
|
- color: $subColor;
|
|
|
- line-height: 26pt;
|
|
|
- }
|
|
|
.signature-area {
|
|
|
color: $subColor;
|
|
|
.first-party {
|
