Merge branch 'cjerp-contract' of http://gitlab.qgutech.com/zhuyuanliang/erp-mobile into test_cjerp

严涛
2 parents f8cdb3de ee0a8fd2
Showing 26 changed files with 289 additions and 49 deletions
api/order_list.js
components/contract-view/productRel.vue
config.js
pages/change_list/add.vue
pages/change_list/detail.vue
pages/change_list/modify.vue
pages/change_list/viewer.vue
pages/contract_foreign_std/productRel.vue
pages/contract_foreign_stock/lock.vue
pages/contract_foreign_stock/productRel.vue
pages/contract_foreign_unplan/lock.vue
pages/contract_foreign_unplan/productRel.vue
pages/contract_process/productRel.vue
pages/contract_retail/productRel.vue
pages/contract_stock/lock.vue
pages/contract_stock/productRel.vue
pages/contract_unplan/lock.vue
pages/contract_unplan/productRel.vue
pages/credit_manage/add.vue
pages/customer/add.vue
--- a/api/order_list.js
View file @cd137a7
+++ b/api/order_list.js
View file @cd137a7
@@ -75,3 +75,14 @@ export function checkApi(params) {
     },
   })
 }
+
+
+// 上传质保书
+export function uploadWarrantyCertificate(params) {
+  return request({
+    url: `${baseUrl}/uploadWarrantyCertificate`,
+    method: 'put',
+    data: params,
+    contentType: ContentTypeEnum.JSON
+  })
+}
--- a/components/contract-view/productRel.vue
View file @cd137a7
+++ b/components/contract-view/productRel.vue
View file @cd137a7
@@ -102,6 +102,11 @@
                                 placeholder="请输入长度公差(单项-)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -179,6 +184,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -246,7 +252,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '' }
         },
         onImmediateChange(idx) {
             this.$nextTick(() => this.recalculate(idx))
--- a/config.js
View file @cd137a7
+++ b/config.js
View file @cd137a7
@@ -4,7 +4,8 @@ module.exports = {
   themeColor: '#3d48a3',
   // baseUrl: 'http://ft.wecando21cn.com/api',
-  baseUrl: 'http://erp.qgutech.com/api',
+  baseUrl: 'http://gjtd.ahcjxc.com:81/api',
+  // baseUrl: 'http://erp.qgutech.com//api',
     // baseUrl: 'http://127.0.0.1:8085',
   // 应用信息
   appInfo: {
@@ -31,10 +32,10 @@ module.exports = {
      }
    ]
   },
-  
+
   loginInfo: {
 	  userName: "",
 	  password: "",
-	  
+
   }
 }
--- a/pages/change_list/add.vue
View file @cd137a7
+++ b/pages/change_list/add.vue
View file @cd137a7
@@ -53,9 +53,9 @@
               <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
             </template>
           </uni-list-item>
-          <uni-list-item title="开票情况">
+          <uni-list-item title="开票要求">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" />
+              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
             </template>
           </uni-list-item>
           <uni-list-item class="amount-item">
@@ -216,7 +216,7 @@ export default {
         const m = res.data || {}
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id
-        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 
+        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({
           ...x,
           assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
         })) : []
--- a/pages/change_list/detail.vue
View file @cd137a7
+++ b/pages/change_list/detail.vue
View file @cd137a7
@@ -27,7 +27,7 @@
         <view class="section">
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
-          <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
+          <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
--- a/pages/change_list/modify.vue
View file @cd137a7
+++ b/pages/change_list/modify.vue
View file @cd137a7
@@ -52,9 +52,9 @@
               <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
             </template>
           </uni-list-item>
-          <uni-list-item title="开票情况">
+          <uni-list-item title="开票要求">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" />
+              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
             </template>
           </uni-list-item>
           <uni-list-item class="amount-item">
@@ -212,7 +212,7 @@ export default {
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id;
         next.purchaseOrderId = m.orderId || '';
-        next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({ 
+        next.purchaseOrderLineList = Array.isArray(m.afterChangeSpecList) ? m.afterChangeSpecList.map(x => ({
           ...x,
           assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
         })) : []
--- a/pages/change_list/viewer.vue
View file @cd137a7
+++ b/pages/change_list/viewer.vue
View file @cd137a7
@@ -27,7 +27,7 @@
     <view class="section">
       <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
-      <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
+      <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
       <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
       <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
         form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
--- a/pages/contract_foreign_std/productRel.vue
View file @cd137a7
+++ b/pages/contract_foreign_std/productRel.vue
View file @cd137a7
@@ -102,6 +102,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -190,6 +195,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -271,7 +277,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
         onNonNegativeInput(idx, field) {
             const it = this.items[idx]
--- a/pages/contract_foreign_stock/lock.vue
View file @cd137a7
+++ b/pages/contract_foreign_stock/lock.vue
View file @cd137a7
@@ -74,6 +74,11 @@
                                 </view>
                             </template>
                         </uni-list-item>
+                        <uni-list-item title="物料编码">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
+                            </template>
+                        </uni-list-item>
                         <uni-list-item title="状态">
                             <template v-slot:footer>
                                 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
@@ -248,6 +253,7 @@ export default {
                     length: v.length || '',
                     lengthTolPos: v.lengthTolPos || '',
                     lengthTolNeg: v.lengthTolNeg || '',
+                    materialCode: v.materialCode || '',
                     status: v.status || '',
                     quantity: v.productQuantity || v.quantity || '',
                     unitPrice: v.unitPrice || '',
--- a/pages/contract_foreign_stock/productRel.vue
View file @cd137a7
+++ b/pages/contract_foreign_stock/productRel.vue
View file @cd137a7
@@ -104,6 +104,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -192,6 +197,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -273,7 +279,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', processingFee: undefined, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
        onNonNegativeInput(idx, field) {
             const it = this.items[idx]
--- a/pages/contract_foreign_unplan/lock.vue
View file @cd137a7
+++ b/pages/contract_foreign_unplan/lock.vue
View file @cd137a7
@@ -73,6 +73,11 @@
                                 </view>
                             </template>
                         </uni-list-item>
+                        <uni-list-item title="物料编码">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
+                            </template>
+                        </uni-list-item>
                         <uni-list-item title="状态">
                             <template v-slot:footer>
                                 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
@@ -246,6 +251,7 @@ export default {
                     length: v.length || '',
                     lengthTolPos: v.lengthTolPos || '',
                     lengthTolNeg: v.lengthTolNeg || '',
+                    materialCode: v.materialCode || '',
                     status: v.status || '',
                     quantity: v.productQuantity || v.quantity || '',
                     unitPrice: v.unitPrice || '',
--- a/pages/contract_foreign_unplan/productRel.vue
View file @cd137a7
+++ b/pages/contract_foreign_unplan/productRel.vue
View file @cd137a7
@@ -102,6 +102,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -186,6 +191,7 @@
                         </view>
                       </view>
                     </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -267,7 +273,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '', sampleOrder: false }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
         onNonNegativeInput(idx, field) {
             const it = this.items[idx]
--- a/pages/contract_process/productRel.vue
View file @cd137a7
+++ b/pages/contract_process/productRel.vue
View file @cd137a7
@@ -134,6 +134,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="定作物数量">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.productQuantity" type="digit" :inputBorder="false" placeholder="请输入数量kg" @input="onNonNegativeInput(idx, 'productQuantity')" @blur="onNonNegativeBlur(idx, 'productQuantity', 2)" />
@@ -214,6 +219,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">定做物数量</text><text class="value">{{ item.productQuantity }}</text></view>
                 <view class="row"><text class="label">加工费单价</text><text class="value">{{ formatCurrency(item.unitPrice)
                         }}</text>
@@ -310,7 +316,7 @@ export default {
   },
   methods: {
     defaultItem() {
-      return { rawProductId: '', rawProductName: '', rawProductGradeId: '', rawProductGradeName: '', industry: '', quality: '', supplyTime: '', materialProductRatio: '', materialProductRatioName: '', materialProductRatioRemarks: '', productName: '', productId: '', productGrade: '', productStatus: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
+      return { rawProductId: '', rawProductName: '', rawProductGradeId: '', rawProductGradeName: '', industry: '', quality: '', supplyTime: '', materialProductRatio: '', materialProductRatioName: '', materialProductRatioRemarks: '', productName: '', productId: '', productGrade: '', productStatus: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode:'',  productQuantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
     },
         onNumberInput(idx, field) {
             const it = this.items[idx]
--- a/pages/contract_retail/productRel.vue
View file @cd137a7
+++ b/pages/contract_retail/productRel.vue
View file @cd137a7
@@ -102,6 +102,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -185,6 +190,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -266,7 +272,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
         onNumberInput(idx, field) {
             const it = this.items[idx]
--- a/pages/contract_stock/lock.vue
View file @cd137a7
+++ b/pages/contract_stock/lock.vue
View file @cd137a7
@@ -69,6 +69,11 @@
                     </view>
                             </template>
                         </uni-list-item>
+                        <uni-list-item title="物料编码">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
+                            </template>
+                        </uni-list-item>
                         <uni-list-item title="状态">
                             <template v-slot:footer>
                                 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
@@ -235,6 +240,7 @@ export default {
                     length: v.length || '',
                     lengthTolPos: v.lengthTolPos || '',
                     lengthTolNeg: v.lengthTolNeg || '',
+                    materialCode: v.materialCode || '',
                     status: v.status || '',
                     quantity: v.productQuantity || v.quantity || '',
                     unitPrice: v.unitPrice || '',
--- a/pages/contract_stock/productRel.vue
View file @cd137a7
+++ b/pages/contract_stock/productRel.vue
View file @cd137a7
@@ -102,6 +102,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -185,6 +190,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -371,7 +377,7 @@ export default {
             return true
         },
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
         onNonNegativeInput(idx, field) {
             const it = this.items[idx]
--- a/pages/contract_unplan/lock.vue
View file @cd137a7
+++ b/pages/contract_unplan/lock.vue
View file @cd137a7
@@ -68,6 +68,11 @@
                     </view>
                             </template>
                         </uni-list-item>
+                        <uni-list-item title="物料编码">
+                            <template v-slot:footer>
+                                <uni-easyinput v-model="item.materialCode" placeholder="请输入物料编码" :clearable="false" disabled />
+                            </template>
+                        </uni-list-item>
                         <uni-list-item title="状态">
                             <template v-slot:footer>
                                 <uni-easyinput v-model="item.status" placeholder="请输入状态" :clearable="false" disabled />
@@ -233,6 +238,7 @@ export default {
                     length: v.length || '',
                     lengthTolPos: v.lengthTolPos || '',
                     lengthTolNeg: v.lengthTolNeg || '',
+                    materialCode: v.materialCode || '',
                     status: v.status || '',
                     quantity: v.productQuantity || v.quantity || '',
                     unitPrice: v.unitPrice || '',
--- a/pages/contract_unplan/productRel.vue
View file @cd137a7
+++ b/pages/contract_unplan/productRel.vue
View file @cd137a7
@@ -102,6 +102,11 @@
                                 placeholder="请输入长度公差下限" @input="onNumberInput(idx, 'lengthTolNeg')" @blur="onNumberBlur(idx, 'lengthTolNeg', 9)" />
                         </template>
                     </uni-list-item>
+                    <uni-list-item title="物料编码">
+                        <template v-slot:footer>
+                            <uni-easyinput v-model="item.materialCode" :inputBorder="false" placeholder="请输入物料编码" />
+                        </template>
+                    </uni-list-item>
                     <uni-list-item title="状态">
                         <template v-slot:footer>
                             <uni-easyinput v-model="item.status" :inputBorder="false" placeholder="请输入状态" />
@@ -185,6 +190,7 @@
                         </view>
                     </view>
                 </view>
+                <view class="row"><text class="label">物料编码</text><text class="value">{{ item.materialCode }}</text></view>
                 <view class="row"><text class="label">状态</text><text class="value">{{ item.status }}</text></view>
                 <view class="row"><text class="label">数量</text><text class="value">{{ item.quantity }}</text></view>
                 <view class="row"><text class="label">单价</text><text class="value">{{ formatCurrency(item.unitPrice)
@@ -266,7 +272,7 @@ export default {
   },
   methods: {
         defaultItem() {
-            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
+            return { productId: '', productName: '', industry: '', brand: '', quality: '', thickness: '', thicknessTolPos: '', thicknessTolNeg: '', width: '', widthTolPos: '', widthTolNeg: '', length: '', lengthTolPos: '', lengthTolNeg: '', materialCode: '', status: '', quantity: '', unitPrice: '', amountExcludingTax: 0, totalAmount: 0, deliveryDate: '', sampleOrder: false }
         },
         onNonNegativeInput(idx, field) {
             const it = this.items[idx]
--- a/pages/credit_manage/add.vue
View file @cd137a7
+++ b/pages/credit_manage/add.vue
View file @cd137a7
@@ -759,10 +759,10 @@ export default {
         .generate-btn {
           margin-left: 24rpx;
-          height: 64rpx;
-          line-height: 64rpx;
+          height: 48rpx;
+          line-height: 48rpx;
           padding: 0 24rpx;
-          font-size: 28rpx;
+          font-size: 24rpx;
           border-radius: 8rpx;
           background: $theme-primary;
           color: #fff;
--- a/pages/customer/add.vue
View file @cd137a7
+++ b/pages/customer/add.vue
View file @cd137a7
@@ -316,10 +316,10 @@ export default {
         .generate-btn {
           margin-left: 24rpx;
-          height: 64rpx;
-          line-height: 64rpx;
+          height: 48rpx;
+          line-height: 48rpx;
           padding: 0 24rpx;
-          font-size: 28rpx;
+          font-size: 24rpx;
           border-radius: 8rpx;
           background: $theme-primary;
           color: #fff;
--- a/pages/customer/modify.vue
View file @cd137a7
+++ b/pages/customer/modify.vue
View file @cd137a7
@@ -323,14 +323,14 @@ export default {
                 align-items: center;
                 .generate-btn {
-                    margin-left: 24rpx;
-                    height: 64rpx;
-                    line-height: 64rpx;
-                    padding: 0 24rpx;
-                    font-size: 28rpx;
-                    border-radius: 8rpx;
-                    background: $theme-primary;
-                    color: #fff;
+                  margin-left: 24rpx;
+                  height: 48rpx;
+                  line-height: 48rpx;
+                  padding: 0 24rpx;
+                  font-size: 24rpx;
+                  border-radius: 8rpx;
+                  background: $theme-primary;
+                  color: #fff;
                 }
             }
         }
--- a/pages/invoice/detail.vue
View file @cd137a7
+++ b/pages/invoice/detail.vue
View file @cd137a7
@@ -20,9 +20,21 @@
           <Product mode="view" :status="form.status" :list="form.detailList" @applyDelay="applyDelayFun"
             @split="splitFun" />
         </view>
+
         <view class="section">
           <view class="row"><text class="label">签收单据</text><text class="value act" @click="downloadFile(form.fileId, form.fileName)">{{ form.fileName }}</text></view>
         </view>
+
+        <view class="section">
+          <view class="row">
+            <text class="label">质保书</text>
+            <view class="value">
+              <view v-for="item in form.warrantyCertificateList" :key="item.fileId" class="file-item" @click="downloadFile(item.fileId, item.fileName)">
+                <text class="value act">{{ item.fileName }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
       </view>
     </scroll-view>
     <detail-buttons :buttons="displayButtons" @click="handleButtonClick" />
@@ -47,11 +59,11 @@
     <uni-popup ref="fillDatePopup" type="bottom" :mask-click="false">
       <view class="dialog">
         <view class="dialog_header">
-          <text>填写日期</text>
+          <text>填写日期</text> 
           <view class="dialog_close" @click="closeFillDateInfo"></view>
-        </view>
+        </view> 
         <view class="dialog_body fill-data_body">
-          <uni-list>
+          <uni-list> 
             <uni-list-item title="原发货日期">
               <template v-slot:footer>
                 <view class="value">{{ fillDateForm.shipmentsDate }}</view>
@@ -827,4 +839,10 @@ export default {
     }
   }
 }
+.file-item {
+  margin-bottom: 12rpx;
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
 </style>
--- a/pages/order_list/approve.vue
View file @cd137a7
+++ b/pages/order_list/approve.vue
View file @cd137a7
@@ -74,9 +74,9 @@
               <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
             </template>
           </uni-list-item>
-          <uni-list-item title="开票情况">
+          <uni-list-item title="开票要求">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" />
+              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
             </template>
           </uni-list-item>
           <uni-list-item class="amount-item">
@@ -191,7 +191,7 @@
         <view class="section">
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
-          <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
+          <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
@@ -331,7 +331,7 @@ export default {
         const m = res.data || {}
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id
-        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 
+        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({
           ...x,
           assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
         })) : []
--- a/pages/order_list/detail.vue
View file @cd137a7
+++ b/pages/order_list/detail.vue
View file @cd137a7
@@ -37,13 +37,16 @@
         <view class="section">
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
-          <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
+          <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>
           <view v-if="form.executionStandard === 'OTHER'" class="row"><text class="label">标准</text><text
               class="value">{{ form.executionStandardRemarks }}</text></view>
         </view>
+        <view class="section">
+          <view class="row"><text class="label">质保书</text><text class="value act" @click="downloadFile(form.warrantyCertificateFileId, form.warrantyCertificateFileName)">{{ form.warrantyCertificateFileName }}</text></view>
+        </view>
         <view class="title-header">
           <image class="title-header_icon" src="/static/images/title.png" />
@@ -66,13 +69,32 @@
       </view>
     </scroll-view>
     <detail-buttons :buttons="displayButtons" @click="handleButtonClick" />
+    <uni-popup ref="uploadPopup" type="bottom" :mask-click="false">
+      <view class="dialog">
+        <view class="dialog_header">
+          <text>上传质保书</text>
+          <view class="dialog_close" @click="closeUploadInfo"></view>
+        </view>
+        <view class="dialog_body">
+          <view class="dialog_row">
+            <text class="dialog_label">质保书</text>
+            <FileUpload v-model="uploadFile" />
+          </view>
+        </view>
+        <view class="dialog_footer">
+          <button class="btn confirm" type="primary" @click="onUploadSave">保存</button>
+        </view>
+      </view>
+    </uni-popup>
   </view>
 </template>
 <script>
-import { getDetailApi, cancelApi, checkApi } from '@/api/order_list.js'
+import { getDetailApi, cancelApi, checkApi, uploadWarrantyCertificate } from '@/api/order_list.js'
 import Product from './product.vue'
 import DetailButtons from '@/components/detail-buttons/index.vue'
+import FileUpload from '@/components/file-upload/index.vue'
+import { downloadFile } from '@/utils/downloadFile.js'
 import {
   getDicName
 } from '@/utils/dic.js'
@@ -82,7 +104,7 @@ import {
 export default {
   name: 'OrderListDetail',
-  components: { Product, DetailButtons },
+  components: { Product, DetailButtons, FileUpload },
   data() {
     return {
       form: {},
@@ -92,7 +114,9 @@ export default {
         { text: '审核', visible: true, variant: 'primary', event: 'audit' },
         { text: '申请发货', visible: true, variant: 'outline', event: 'shipmentApply' },
         { text: '取消', visible: true, variant: 'outline', event: 'cancel', style: { color: 'rgba(0,0,0,0.9)', border: '1px solid #DCDCDC' } },
+        { text: '上传质保书', visible: true, variant: 'outline', event: 'upload' },
       ],
+      uploadFile: { id: '', name: '' },
       dicOptions: {
         AUDIT_STATUS: [],
         SUPPLIER: [],
@@ -105,13 +129,16 @@ export default {
       const s = String((this.form && this.form.status) || '')
       const e = String((this.form && this.form.examineStatus) || '')
       const d = (this.form && this.form.showExamine) || false
+      const u = (this.form && this.form.showUpload) || false
+
       return {
         isRefuse: e === 'REFUSE',
         isAudit: e === 'AUDIT',
         isAuditDetail: !this.form.sampleOrder,
         canExamine: d,
         canDeliveryApply: s === 'ISSUED' && (!this.form.freeze || false) && Number(this.form.totalQuantity) > 0,
-        contractCreateBy: this.form.contractCreateBy
+        contractCreateBy: this.form.contractCreateBy,
+        showUpload: u,
       }
     },
     displayButtons() {
@@ -123,6 +150,7 @@ export default {
         { ...this.buttons[2], visible: f.isAudit && f.canExamine && this.$auth.hasPermi('order-manage:order-list:approve') },
         { ...this.buttons[3], visible: f.canDeliveryApply && this.$auth.hasPermi('order-manage:order-list:apply') },
         { ...this.buttons[4], visible: f.isRefuse && f.contractCreateBy && this.$auth.hasPermi('order-manage:order-list:cancel') },
+        { ...this.buttons[5], visible: f.showUpload && this.$auth.hasPermi('order-manage:order-list:upload') },
       ]
     }
   },
@@ -151,6 +179,7 @@ export default {
         audit: () => this.onAudit(),
         shipmentApply: () => this.onShipmentApply(),
         cancel: () => this.onCancel(),
+        upload: () => this.onUpload(),
       }
       const fn = map[btn.event]
       if (typeof fn === 'function') fn()
@@ -206,6 +235,37 @@ export default {
         }
       })
     },
+    onUpload() {
+      this.$refs.uploadPopup && this.$refs.uploadPopup.open()
+    },
+    downloadFile,
+    closeUploadInfo() {
+      this.uploadFile = { id: '', name: '' };
+      this.$refs.uploadPopup && this.$refs.uploadPopup.close()
+    },
+    async onUploadSave() {
+      console.log('onUploadSave__this.uploadFile', this.uploadFile)
+      if (!this.uploadFile.id) {
+        uni.showToast({
+          title: '请上传质保书',
+          icon: 'none'
+        })
+        return
+      }
+      const params = {
+        warrantyCertificateFileId: this.uploadFile.id,
+        warrantyCertificateFileName: this.uploadFile.name,
+        id: this.form.id
+      }
+      try {
+        await uploadWarrantyCertificate(params)
+        uni.showToast({ title: '保存成功', icon: 'success' })
+        setTimeout(() => { uni.redirectTo({ url: '/pages/order_list/index' }) }, 300)
+      } catch (e) {
+        uni.showToast({ title: (e && e.msg) || '保存失败', icon: 'none' })
+      }
+    },
+
     loadAllDicData() {
       const dicCodes = ['AUDIT_STATUS', 'SUPPLIER', 'APPLICABLE_STANDARD']
       return getDicByCodes(dicCodes).then(results => {
@@ -472,4 +532,82 @@ export default {
     font-weight: 600;
   }
 }
+
+.dialog {
+  width: 100%;
+  overflow-y: auto;
+  padding: 32rpx 28rpx calc(20rpx + env(safe-area-inset-bottom));
+  background: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+
+  &_header {
+    position: relative;
+    text-align: center;
+    font-size: 34rpx;
+    font-weight: 600;
+    margin-bottom: 12rpx;
+    color: rgba(0, 0, 0, 0.9);
+  }
+
+  &_body {
+    padding: 12rpx 4rpx 24rpx;
+    max-height: 70vh;
+    overflow-y: auto;
+
+  }
+
+  .split_body {
+    max-height: 60vh;
+  }
+
+  &_footer {
+    padding-top: 12rpx;
+    display: flex;
+    justify-content: center;
+
+    .btn {
+      width: 100%;
+      height: 80rpx;
+      line-height: 80rpx;
+      border-radius: 12rpx;
+      font-size: 32rpx;
+      background: $theme-primary;
+      color: #fff;
+
+      &::after {
+        border: none;
+      }
+    }
+  }
+}
+
+.dialog_close {
+  position: absolute;
+	right: 16rpx;
+	top: 0rpx;
+	width: 48rpx;
+	height: 48rpx;
+	background-image: url('~@/static/images/flow/close_icon.png');
+	background-repeat: no-repeat;
+	background-position: right center;
+	background-size: cover;
+}
+
+.dialog_row {
+  margin-bottom: 24rpx;
+}
+
+.dialog_label {
+  display: block;
+  margin-bottom: 12rpx;
+  font-size: 28rpx;
+  color: rgba(0, 0, 0, 0.9);
+}
+
+.upload-show {
+  margin-top: 8rpx;
+  font-size: 26rpx;
+  color: rgba(0, 0, 0, 0.6);
+}
+
 </style>
--- a/pages/order_list/modify.vue
View file @cd137a7
+++ b/pages/order_list/modify.vue
View file @cd137a7
@@ -72,9 +72,9 @@
               <uni-easyinput v-model="form.priceListNo" placeholder="请输入价格表编号" :inputBorder="false" />
             </template>
           </uni-list-item>
-          <uni-list-item title="开票情况">
+          <uni-list-item title="开票要求">
             <template v-slot:footer>
-              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票情况" :inputBorder="false" />
+              <uni-easyinput v-model="form.invoicingStatus" placeholder="请输入开票要求" :inputBorder="false" />
             </template>
           </uni-list-item>
           <uni-list-item class="amount-item">
@@ -155,7 +155,7 @@
       </uni-list>
     </scroll-view>
-    
+
     <SingleSelectSheet :visible.sync="sheet.visible" :title="sheet.title" :options="sheet.options" v-model="sheet.value"
       @confirm="onSheetConfirm" />
   </view>
@@ -230,7 +230,7 @@ export default {
         const m = res.data || {}
         const next = { ...this.form, ...m }
         next.id = m.id || m.code || id
-        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({ 
+        next.purchaseOrderLineList = Array.isArray(m.purchaseOrderLineList) ? m.purchaseOrderLineList.map(x => ({
           ...x,
           assessmentExceedsAgreement: Number(x.assessmentExceedsAgreement || 0).toFixed(2) || 0.00,
          })) : []
--- a/pages/order_list/viewer.vue
View file @cd137a7
+++ b/pages/order_list/viewer.vue
View file @cd137a7
@@ -26,7 +26,7 @@
         <view class="section">
           <view class="row"><text class="label">价格表编号</text><text class="value">{{ form.priceListNo }}</text></view>
-          <view class="row"><text class="label">开票情况</text><text class="value">{{ form.invoicingStatus }}</text></view>
+          <view class="row"><text class="label">开票要求</text><text class="value">{{ form.invoicingStatus }}</text></view>
           <view class="row"><text class="label">运费</text><text class="value">{{ form.shippingCost }}</text></view>
           <view class="row"><text class="label">执行标准</text><text class="value">{{ getDicName('APPLICABLE_STANDARD',
             form.executionStandard, dicOptions.APPLICABLE_STANDARD) }}</text></view>