1.修改付款申请访问地址

2.新增备注字段

src/api/business/purchase/purchase-order.js

@@ -104,7 +104,7 @@ const payRequest = (userCode) => {
 
   return new Promise(resolve => {
     // 当前 Promise 的状态由传入的 Promise 去决定
-    axios.get(`/sy-derom/apiproxy/service/ssoRegServlet?userCode=${userCode}&busiCenter=001`)
+    axios.get(`${process.env.NODE_ENV == "development" ? '/sy-derom' : 'https://sy.derom.com'} /apiproxy/service/ssoRegServlet?userCode=${userCode}&busiCenter=001`)
     .then(res =>{
       if(res.status == 200){
         resolve(res.data)

src/views/purchase/purchase-order/add/column.js

@@ -399,6 +399,12 @@ export const Columns = [
     span: 24,
     isShow:true,
   },
+  { 
+    key: "remark",
+    title: "备注",
+    inputType: "Textarea",
+    isShow:true,
+   },
 
 ];
 
@@ -435,8 +441,10 @@ export const TabColumns = [
           specification:'specification',
           model:'model',
           isMedcine:'isMedicineValue',
-          manufacturer:'manufacturerIdName',
-          unit:'unitIdName',
+          manufacturer:'manufacturerId',
+          manufacturerName:'manufacturerIdName',
+          unit:'unitId',
+          unitName:'unitIdName',
           // tax:'materialRateName',
           storageCondition:'storageCondition',
           carriageCondition:'transportationCondition',
@@ -496,7 +504,7 @@ export const TabColumns = [
         readonly:true,
         },
       { // manufacturerId  manufacturerIdName
-        key: "manufacturer",
+        key: "manufacturerName",
         title: "生产厂家代理人",
         inputType: "Input",
         width: 180,
@@ -510,7 +518,7 @@ export const TabColumns = [
          disabled:true,
       },
       { //unitId  unitIdName
-        key: "unit", 
+        key: "unitName", 
         title: "单位", 
         inputType: "Input",
         disabled:true,
@@ -734,8 +742,10 @@ export const TabColumns = [
           specification:'specification',
           model:'model',
           isMedcine:'isMedicineValue',
-          manufacturer:'manufacturerIdName',
-          unit:'unitIdName',
+          manufacturer:'manufacturerId',
+          manufacturerName:'manufacturerIdName',
+          unit:'unitId',
+          unitName:'unitIdName',
           // tax:'materialRateName',
           storageCondition:'storageCondition',
           carriageCondition:'transportationCondition',

src/views/purchase/purchase-order/column.js

@@ -129,7 +129,8 @@ export const TableColumns = [
   { key: "projectNowName", title: "在建工程项目" },
   { key: "operatingItemsName", title: "经营性项目" },
   { key: "isArrivalReson", title: "到货超期原因" },
-  { key: "midOrderNo", title: "中台采购订单号" }
+  { key: "midOrderNo", title: "中台采购订单号" },
+  { key: "remark", title: "备注" },
 ];
 
 export const TabColumns = [
@@ -149,16 +150,20 @@ export const TabColumns = [
       {
         key: "isMedcine",
         title: "医药物料",
-        width: 180,
         inputType: 'Checkbox',
         width:80,
       },
-      { key: "manufacturer", title: "生产厂家代理人", width: 180 },
-      { key: "isDrug", title: "物料药品属性", width: 180 },
-      { key: "unit", title: "单位", width: 180 },
+      { key: "manufacturerName", title: "生产厂家代理人", width: 180 },
+      { 
+        key: "isDrug", 
+        title: "物料药品属性",
+        inputType: 'Checkbox',
+        width:80, 
+      },
+      { key: "unitName", title: "单位", width: 180 },
       { key: "qty", title: "数量" },
       // { key: "currency", title: "币种" },
-      { key: "currencyName", title: "币种" },
+      // { key: "currencyName", title: "币种" },
       { key: "taxPrice", title: "含税单价" },
       { key: "money", title: "价税合计" },
       { key: "tax", title: "税率" },

src/views/purchase/purchase-order/edit/initColumn.js

@@ -36,7 +36,7 @@ export const forbidden = (isEdit) => {
 
       if (item.key == 'buyerName' || item.key == 'puDeptName' || item.key == 'deductionMoney' ||
         item.key == 'supplierContactsName' || item.key == 'agentName' || item.key == 'isInvoice' ||
-        item.key == 'rebateMoney') {
+        item.key == 'rebateMoney' || t.key == 'remark') {
         item.disabled = false;
         item.readonly = false;
       } else {
@@ -52,7 +52,7 @@ export const forbidden = (isEdit) => {
         if (t.key == 'unit' || t.key == 'qty' ||
           t.key == 'place' || t.key == 'arrivalDatePlan' || t.key == 'storageCondition' ||
           t.key == 'carriageCondition' || t.key == 'customerName' || t.key == 'isBatchLock' ||
-          t.key == 'isReplenishment' || t.key == 'originalQty' || t.key == 'originalMoney'
+          t.key == 'isReplenishment' || t.key == 'originalQty' || t.key == 'originalMoney' 
         ) {
 
           t.disabled = false;

src/views/purchase/purchase-order/see/index.vue

@@ -47,6 +47,9 @@ export default {
   methods: {
     setVisible(prop) {
       this.visible = prop;
+      if(!this.visible){
+        this.$refs['orderSeeForm'].clearValidate();
+      }
     },
 
     //查询详情
@@ -122,7 +125,14 @@ export default {
     size="100%" 
     :with-header="false" :visible.sync="visible" @open="beforeOpen"
     @close="$emit('close')">
-    <el-form size="mini" label-position="right" label-width="140px" :model="params" :rules="rules">
+    <el-form 
+      size="mini" 
+      label-position="right" 
+      label-width="140px" 
+      :model="params" 
+      :rules="rules"
+      ref="orderSeeForm" 
+    >
       <el-card :body-style="{
         padding: '20px',
         display: 'flex',