sc

Reviewed-on: http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web/pulls/2

src/permission.js

@@ -14,7 +14,15 @@ const { start, done } = useNProgress()
 
 const { loadStart, loadDone } = usePageLoading()
 // 路由不重定向白名单
-const whiteList = ['/login', '/social-login', '/auth-redirect', '/bind', '/register', '/swagger']
+const whiteList = [
+  '/login',
+  '/mp-login',
+  '/social-login',
+  '/auth-redirect',
+  '/bind',
+  '/register',
+  '/swagger'
+]
 
 // 路由加载前
 router.beforeEach(async (to, from, next) => {

src/router/modules/remaining.ts

@@ -161,6 +161,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/mp-login',
+    component: () => import('@/views/Login/MPLogin.vue'),
+    name: 'MPLogin',
+    meta: {
+      hidden: true,
+      title: '用户绑定',
+      noTagsView: true
+    }
+  },
   {
     path: '/sso',
     component: () => import('@/views/Login/Login.vue'),

src/views/Basic/Role/Comp/ReportDaily.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="pl-20px pr-20px">
     <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
+      <el-form-item label="开启通知">
+        <el-radio-group v-model="form.kaiqitongzhi">
+          <el-radio :label="1"> 开启 </el-radio>
+          <el-radio :label="0"> 关闭 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
       <el-form-item label="发送途径">
         <el-checkbox-group v-model="form.fasongtujing">
           <el-checkbox :label="1">系统通知</el-checkbox>
@@ -96,6 +103,7 @@ async function getReportInfo() {
   try {
     formLoading.value = true
     form.value = {
+      kaiqitongzhi: 1,
       fasongtujing: [1, 2],
       sendTime: '21:00:00',
       sendContent: [21, 22, 23]

src/views/Clue/Order/Comp/DialogDelivery.vue

@@ -77,6 +77,32 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12" :offset="0">
+            <el-form-item label="其他支出">
+              <el-select v-model="extraPay.extraPayType" placeholder="其他支出类型" filterable>
+                <el-option
+                  v-for="item in extraPayOptions"
+                  :key="item.id"
+                  :label="item.extraPayName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" :offset="0">
+            <el-form-item label="支出金额">
+              <el-input-number v-model="extraPay.extraPayMoney" :controls="false" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24" :offset="0">
+            <el-form-item label="支出备注">
+              <el-input v-model="extraPay.remark" placeholder="备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </template>
       <template v-else>
         <el-table :data="inventoryList" @selection-change="handleSelectionChange">
@@ -98,7 +124,7 @@
           </el-table-column>
         </el-table>
       </template>
-      <el-form-item label="备注">
+      <el-form-item label="发货备注">
         <Editor v-model:modelValue="form.remark" />
       </el-form-item>
     </el-form>
@@ -116,15 +142,20 @@ import { getSimpleWarehouseList, getRemainInventoryList } from '@/api/mall/wareh
 import { createDelivery } from '@/api/clue/delivery'
 import { getConfigList } from '@/api/system/set'
 import { getDictOptions } from '@/utils/dict'
+import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
 
 const message = useMessage() // 消息弹窗
 
 const warehouseOptions = ref([])
+const extraPayOptions = ref([])
 const supplierOptions = getDictOptions('erp_supplier')
 function getOptions() {
   getSimpleWarehouseList().then((data) => {
     warehouseOptions.value = data
   })
+  getExtraFeeSimpleList().then((data) => {
+    extraPayOptions.value = data
+  })
 }
 
 function getRemainInventory(signProductId) {
@@ -144,6 +175,7 @@ defineExpose({
 })
 
 const form = ref({})
+const extraPay = ref({})
 const rules = ref({
   supplier: { required: true, message: '供应商不可为空', trigger: 'change' },
   warehouseId: { required: true, message: '仓库不可为空', trigger: 'change' },
@@ -164,6 +196,11 @@ function resetForm(row) {
     unitPrice: undefined,
     remark: undefined
   }
+  extraPay.value = {
+    extraPayType: undefined,
+    extraPayMoney: undefined,
+    remark: undefined
+  }
 }
 
 const emit = defineEmits(['success'])
@@ -209,6 +246,9 @@ async function onSubmit() {
         unitPrice: form.value.unitPrice,
         warehouseId: form.value.warehouseId
       }
+      if (extraPay.value.extraPayMoney) {
+        params.purchaseOrder.extraPay = [extraPay.value]
+      }
     } else {
       params.detailList = deliveryArr.value
     }

src/views/Clue/Order/Comp/Reback.vue

@@ -186,7 +186,15 @@
         </template>
       </el-table-column>
       <el-table-column prop="signPrice" label="成交价" min-width="90" />
-      <el-table-column prop="isPayoff" label="是否结清" min-width="90" />
+      <el-table-column prop="isPayoff" label="是否结清" min-width="90">
+        <template #default="{ row }">
+          <el-select v-if="row.edit" size="small" v-model="row.isPayoffValue">
+            <el-option label="结清" :value="true" />
+            <el-option label="未结清" :value="false" />
+          </el-select>
+          <div v-else>{{ row.isPayoff }}</div>
+        </template>
+      </el-table-column>
       <el-table-column
         v-if="appStore.getAppInfo?.instanceType == 1"
         prop="receiverName"
@@ -429,16 +437,19 @@ async function handleUpdate(row) {
       id: row.id,
       money: row.money,
       companyProfit: row.companyProfit,
-      personProfit: row.personProfit
+      personProfit: row.personProfit,
+      isPayoff: row.isPayoffValue
     })
       .then(() => {
         message.success('修改成功')
+        getList()
       })
       .finally(() => {
         row.edit = false
       })
   } else {
     row.edit = true
+    row.isPayoffValue = row.isPayoff == '结清'
   }
 }
 

src/views/Login/MPLogin.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="p-20px">
+    <p class="mb-30px font-bold text-20px">微信授权登陆</p>
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto">
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model="form.username" placeholder="请输入用户名" />
+      </el-form-item>
+      <el-form-item label="密码" prop="password">
+        <el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
+      </el-form-item>
+    </el-form>
+    <el-button type="primary" class="w-full" @click="onSubmit">授权登陆</el-button>
+    <div v-if="form.code">code: {{ form.code }}</div>
+  </div>
+</template>
+
+<script setup name="MPLogin">
+const form = ref({
+  code: undefined,
+  username: undefined,
+  password: undefined
+})
+const formRef = ref()
+const rules = {
+  username: { required: true, message: '用户名不可为空', trigger: 'blur' },
+  password: { required: true, message: '密码不可为空', trigger: 'blur' }
+}
+
+// 微信授权登陆地址
+const WX_AUTH_URL = 'https://open.weixin.qq.com/connect/oauth2/authorize?'
+// 重定向参数-固定写法
+const REDIRECT = '#wechat_redirect'
+
+const params = ref({
+  appid: 'wxf87aa1f474c0494f', // 公众号 APP ID
+  redirect_uri: ``, // 授权后重定向的回调链接地址， 请使用 urlEncode 对链接进行处理
+  response_type: 'code', // 固定写法
+  scope: 'snsapi_base' // snsapi_base 静默授权获取 open id ；snsapi_userinfo 需要用户授权，获取详细信息
+  // state:'code', // a-zA-Z0-9的参数值，最多128字节
+})
+function onSubmit() {
+  // 这些需要判断没有 code 情况拉起授权登陆，有就结束放在重复拉起授权登陆
+  if (!form.value.code) {
+    const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
+    location.href = access_url
+  } else {
+    alert(`授权成功!`)
+  }
+}
+
+onMounted(() => {
+  const uri = location.origin + location.pathname
+  params.value.redirect_uri = encodeURI(uri)
+  // 获取地址参数
+  const param = new URLSearchParams(location.search)
+  form.value.code = param.get('code')
+
+  if (!form.value.code) {
+    const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
+    location.href = access_url
+  }
+})
+</script>
+
+<style lang="scss" scoped></style>