暂存

src/DRP/HDrpManagement/orderManage/detail/index.vue

@@ -94,10 +94,10 @@
               <a-input-number v-if="orderData.type == '特殊订单'" v-model:value="data.record.qty" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)" @change="inputChange(data.record,'qty')" @blur="isChange = true"></a-input-number>
               <a-input-number v-else v-model:value="data.record.qty" :precision="2" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)" :min="data.record.orderminqty" :step="data.record.orderaddqty" @change="inputChange(data.record,'qty')"></a-input-number>
             </template>
-            <template v-if="data.column.dataIndex === 'price'">
+            <template v-if="data.column.dataIndex === 'price' && utils.hasPermission('priceChange')">
               <a-input v-if="canEdit" v-model:value="data.record.price" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)"  @change="inputChange(data.record,'price')"  @blur="isChange = true"></a-input>
             </template>
-            <template v-if="data.column.dataIndex === 'amount'">
+            <template v-if="data.column.dataIndex === 'amount' && utils.hasPermission('priceChange')">
               <a-input v-if="canEdit" v-model:value="data.record.amount" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],isEditDisabled)"  @change="inputChange(data.record,'amount')"  @blur="isChange = true"></a-input>
             </template>
             <template v-if="data.column.dataIndex === 'remarks'">

src/DRP/SDrpManagement/ftMxAgent/index.vue

@@ -8,6 +8,12 @@
         <table-export :param="param"></table-export>
       </template> -->
       <template #tb_cell="{data}">
+        <template v-if="data.column.dataIndex === 'sonum'">
+          <!-- <span>{{utils.formatAmount(data.record.amount)}}</span> -->
+          <router-link :to="{path:'/agent_orderDetails',query:{id:data.record.sa_orderid}}">
+            {{data.record.sonum}}
+          </router-link>
+        </template>
         <template v-if="data.column.dataIndex === 'amount'">
           <span>{{utils.formatAmount(data.record.amount)}}</span>
         </template>

src/DRP/SDrpManagement/myAccountList/index.vue

@@ -32,6 +32,11 @@
         <template v-if="data.column.dataIndex === 'balance'">
           <span>{{utils.formatAmount(data.record.balance)}}</span>
         </template>
+        <template v-if="data.column.dataIndex === 'sourcenote'">
+          <router-link :to="{path:'/agent_orderDetails',query:{id:data.record.ownerid}}">
+            {{data.record.sourcenote}}
+          </router-link>
+        </template>
       </template>
     </listTemp>
   </div>

src/components/noticeModal/index.vue

@@ -5,7 +5,7 @@
       <p><small>{{detailsData.checkdate}}</small>&nbsp;<small>{{detailsData.createby}}</small></p>
       <div style="width:100%" v-html="detailsData.content"></div>
       <template #footer>
-        <a-button key="back" type="text" @click="noTips"><small style="color:#888">本次登陆不再提醒</small></a-button>
+        <!-- <a-button key="back" type="text" @click="noTips"><small style="color:#888">本次登陆不再提醒</small></a-button> -->
         <a-button key="back" type="link" v-if="pageInfo.pageNumber <= 1" @click="prevdata">上一条</a-button>
         <a-button v-if="pageInfo.pageNumber == pageInfo.pageTotal" type="link" @click="visible = false">关闭</a-button>
         <a-button v-else type="link" :disabled="pageInfo.pageNumber == pageInfo.pageTotal" @click="nextdata">下一条</a-button>

src/customized/cucu/orderManage/detail/index.vue

@@ -99,10 +99,10 @@
               <a-input-number v-if="orderData.type == '特殊订单'" v-model:value="data.record.qty" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭','手工关闭'],isEditDisabled)" @change="inputChange(data.record,'qty')" @blur="isChange = true"></a-input-number>
               <a-input-number v-else v-model:value="data.record.qty" :precision="2" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭','手工关闭'],isEditDisabled)" :min="data.record.orderminqty" :step="data.record.orderaddqty" @change="inputChange(data.record,'qty')" @blur="isChange = true"></a-input-number>      
             </template>
-            <template v-if="data.column.dataIndex === 'price'">
+            <template v-if="data.column.dataIndex === 'price' && utils.hasPermission('priceChange')">
               <a-input v-if="canEdit" v-model:value="data.record.price" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭','手工关闭'],isEditDisabled)"  @change="inputChange(data.record,'price')" @blur="isChange = true"></a-input>
             </template>
-            <template v-if="data.column.dataIndex === 'amount'">
+            <template v-if="data.column.dataIndex === 'amount' && utils.hasPermission('priceChange')">
               <a-input v-if="canEdit" v-model:value="data.record.amount" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭','手工关闭'],isEditDisabled)"  @change="inputChange(data.record,'amount')" @blur="isChange = true"></a-input>
             </template>
             <template v-if="data.column.dataIndex === 'remarks'">

src/style.less

@@ -169,4 +169,7 @@ button:focus-visible {
   font-family: SimSun,sans-serif;
   line-height: 1;
   content: "*";
+}
+.w-e-full-screen-container{
+  z-index: 99999;
 }

vite.config.js

@@ -11,12 +11,12 @@ export default defineConfig({
     }
   },
   //楚楚
-  define: {
-    'process.env': {
-      'BASE_API':"https://cucu.cnyunl.com:8079",
-      'BASE_WS':"wss://cucu.cnyunl.com:8079/" 
-    }
-  },
+  // define: {
+  //   'process.env': {
+  //     'BASE_API':"https://cucu.cnyunl.com:8079",
+  //     'BASE_WS':"wss://cucu.cnyunl.com:8079/" 
+  //   }
+  // },
 
   // 正式地址
   // define: {
@@ -27,12 +27,12 @@ export default defineConfig({
   // },
 
   // 测试地址
-  // define: {
-  //   'process.env': {
-  //     'BASE_API':"http://61.164.207.46:8200",
-  //     'BASE_WS':"ws://61.164.207.46:8200/"
-  //   }
-  // },
+  define: {
+    'process.env': {
+      'BASE_API':"http://61.164.207.46:8200",
+      'BASE_WS':"ws://61.164.207.46:8200/"
+    }
+  },
   server: {
     proxy: {
       "/api": {