销售公司更新 10.8 zyp

src/api/qw/account.js

@@ -52,9 +52,9 @@ export function exportAccount(query) {
   })
 }
 //根据账号获取设备id
-export function getDeviceId(userName) {
+export function getDeviceId(account) {
   return request({
-    url: '/qw/account/getDeviceId/' + userName,
+    url: '/qw/account/getDeviceId/' + account,
     method: 'get'
   })
 }

src/views/qw/qwAccounts/index.vue

@@ -15,7 +15,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号"  width="55" type="index" align="center" />
       <el-table-column label="账号id" align="center" prop="id" />
-      <el-table-column label="企微账号" align="center" prop="userName" />
+      <el-table-column label="企微账号" align="center" prop="account" />
       <el-table-column label="姓名" align="center" prop="nickName" />
       <el-table-column label="手机号码" align="center" prop="phone" />
       <el-table-column label="审核状态" align="center" prop="isAudit" >
@@ -38,8 +38,8 @@
 
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="企微账号" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入企微账号"   />
+        <el-form-item label="企微账号" prop="account">
+          <el-input v-model="form.account" placeholder="请输入企微账号"   />
         </el-form-item>
         <el-form-item label="手机号" prop="phone">
           <el-input v-model="form.phone" placeholder="请输入手机号"   />
@@ -92,7 +92,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userName: null,
+        account: null,
         passWord: null,
         phone: null,
         email: null,
@@ -151,7 +151,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        userName: null,
+        account: null,
         passWord: null,
         phone: null,
         email: null,

src/views/qw/qwLogin/index.vue

@@ -5,7 +5,7 @@
         <el-card class="scan-card" shadow="hover">
           <div class="scan-card-content">
             <h1 class="title">扫码登录</h1>
-            <el-input v-model="userName" placeholder="请输入账号" style="margin-bottom: 20px;"></el-input>
+            <el-input v-model="account" placeholder="请输入账号" style="margin-bottom: 20px;"></el-input>
             <el-button type="primary" @click="login" >登录</el-button>
             <div class="qrcode-container" v-show="showQRCode">
               <div>
@@ -26,7 +26,7 @@ import { getDeviceId} from '@/api/qw/account';
 export default {
   data() {
     return {
-      userName: '', // 用户输入的账号
+      account: '', // 用户输入的账号
       qrcode: null, // 二维码实例
       loading: false, // 刷新按钮加载状态
       deviceId: '', // 账号关联的 deviceId
@@ -37,15 +37,15 @@ export default {
   },
   methods: {
     login() {
-      const userName = this.userName;
-      getDeviceId(userName).then(response => {
+      const account = this.account;
+      getDeviceId(account).then(response => {
         this.deviceId = response.deviceId;
       });
       this.showQRCode = !!this.deviceId; // 根据 deviceId 控制是否显示二维码
       if (this.showQRCode) {
           // 获取二维码
           getQrCode(this.deviceId).then(response => {
-            this.qrCode = response.data; 
+            this.qrCode = response.data.qrcode; 
             const base64Data = this.qrCode; // Base64 编码
             const image = new Image();
             image.onload = () => {

src/views/store/components/productAfterSalesOrder.vue

@@ -185,17 +185,17 @@
     <el-dialog :title="add.title" :visible.sync="add.open" width="500px" append-to-body>
 
     <div slot="footer" class="dialog-footer">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="id" prop="id" v-if="false">
-          <el-input v-model="form.id" placeholder="请输入"  />
-        </el-form-item>
-        <el-form-item label="快递公司" prop="deliveryName">
-          <el-input v-model="form.deliveryName" placeholder="请输入"  />
-        </el-form-item>
-        <el-form-item label="运单号" prop="deliverySn">
-          <el-input v-model="form.deliverySn" placeholder="请输入"  />
-        </el-form-item>
-      </el-form>
+      <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="100px">
+          <el-form-item label="id" prop="id" v-if="false">
+            <el-input v-model="addForm.id" placeholder="请输入"  />
+          </el-form-item>
+          <el-form-item label="快递公司" prop="deliveryName">
+            <el-input v-model="addForm.deliveryName" placeholder="请输入"  />
+          </el-form-item>
+          <el-form-item label="运单号" prop="deliverySn">
+            <el-input v-model="addForm.deliverySn" placeholder="请输入"  />
+          </el-form-item>
+        </el-form>
       <el-button type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="cancel1">取 消</el-button>
     </div>
@@ -224,6 +224,19 @@ export default {
         open:false,
         title:"添加物流"
       },
+      addForm:{
+        id:null,
+        deliveryName:null,
+        deliverySn:null
+      },
+      addRules:{
+        deliveryName: [
+          { required: true, message: "物流名称不能为空", trigger: "blur" }
+        ],
+        deliverySn: [
+          { required: true, message: "物流单号不能为空", trigger: "blur" }
+        ],
+      },
       order:null,
       user:null,
       serviceTypeOptions:[],
@@ -275,10 +288,10 @@ export default {
   methods: {
     submitForm() {
       var id=this.afterSales.id;
-      this.form.id = id;
-      updateStoreAfterSales(this.form).then(response => {
+      this.addForm.id = id;
+      updateStoreAfterSales(this.addForm).then(response => {
               if (response.code === 200) {
-                this.msgSuccess("添加成功");
+                this.msgSuccess("编辑成功");
                 this.add.open = false;
                 this.getStoreAfterSales(id);
               }
@@ -289,6 +302,8 @@ export default {
     },
     addDelivery(){
       this.add.open = true;
+      this.addForm.deliveryName = this.afterSales.deliveryName;
+      this.addForm.deliverySn = this.afterSales.deliverySn;
     },
     showOrder(){
       this.show.open=true;