Merge branch 'master' into pengyouhao_dev

package-lock.json

@@ -4716,9 +4716,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.13.22",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.22.tgz",
-      "integrity": "sha512-cY+c9usrrWNpI6In4ZIxD9AryGWwflRZ2mFgAF/HXFu7gUA7rkYjZjBZ8YIh3iNlr2y8dWtpXUyegwXy6ATM8w==",
+      "version": "2.13.23",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.23.tgz",
+      "integrity": "sha512-8Bff1dAUbYJsyNkm3GXNei+7UTCIi6DOl7NfwY2Kwjv6LOpNA2HN06avJukbrr71Bclh65mHv10YfXU7xgazNA==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.13.22",
+    "@zjlib/element-plugins": "^2.13.23",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

src/components/selectComponent/selectMember.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="选择会员" :visible.sync="show" :show-close="false" width="1000px" :close-on-click-modal="false">
+  <el-dialog title="选择会员" :visible.sync="show" :show-close="false" width="1200px" :close-on-click-modal="false">
     <div class="dialog-container2 clearfix">
       <el-form ref="screenForm" :model="member_screenForm" size="small" label-position="left">
         <el-row :gutter="20">
@@ -8,17 +8,18 @@
               <el-input v-model="member_screenForm.keyword" placeholder="请输入会员名称/电话"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="8" :sm="8" :lg="8">
+          <el-col :xs="7" :sm="7" :lg="7">
             <el-form-item label="注册日期" prop="registerDate" label-width="70px">
               <el-date-picker style="width: 100%" v-model="member_screenForm.registerDate" type="daterange"
                 value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col  :xs="6" :sm="6" :lg="6">
+          <el-col  :xs="7" :sm="7" :lg="7">
             <el-form-item label="" prop="type" label-width="20px">
               <el-radio-group v-model="member_screenForm.type" :disabled="memberList.length > 0 ? true : false">
                 <el-radio :label="'SERVICE'">业务员</el-radio>
+                <el-radio :label="'WORKER'">工程师</el-radio>
                 <el-radio :label="'GENERAL'">普通用户</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -35,12 +36,12 @@
           <el-table-column align="center" prop="nickName" label="会员名称" min-width="150"></el-table-column>
           <el-table-column align="center" prop="sex" label="性别" min-width="100"></el-table-column>
           <el-table-column align="center" prop="mobile" label="注册手机" min-width="100"></el-table-column>
-          <el-table-column align="center" prop="memberName" label="角色" min-width="100">
+          <el-table-column align="center" prop="type" label="角色" min-width="100">
             <template slot-scope="scope">
               {{ scope.row.type | MEMBER_CURRENT_TYPE_FILTER }}
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="memberName" label="状态" min-width="100">
+          <el-table-column align="center" prop="status" label="状态" min-width="100">
             <template slot-scope="scope">
               <el-tag :type="scope.row.status ? 'success' : 'danger'">{{ scope.row.status | MEMBER_CURRENT_STATUS_FILTER
               }}</el-tag>
@@ -90,6 +91,10 @@ export default {
     }
   },
   created() {
+    if(this.memberList.length > 0) {
+      console.log(this.memberList[0].type);
+      this.member_screenForm.type = this.memberList[0].type;
+    }
     this.getMemberList()
   },
   methods: {
@@ -162,6 +167,7 @@ export default {
       this.$emit("selectMemberPass", [...this.memberList, ...this.memberTable_choose])
       this.$nextTick(() => {
         this.$emit("cancelSelectMember")
+        this.memberTable_choose = [];
       })
     },
   }

src/utils/select_data.js

@@ -12,7 +12,8 @@ export const MEMBER_CURRENT_STATUS = [
 // 会员的当前类型
 export const MEMBER_CURRENT_TYPE = [
   { label: '普通用户', value: 'GENERAL' },
-  { label: '业务员', value: 'SERVICE' }
+  { label: '业务员', value: 'SERVICE' },
+  { label: '工程师', value: 'WORKER' },
 ]
 
 // 结算的当前状态

src/views/auxiliaryFittings/purchasingManagement/components/retStorage.vue

@@ -17,8 +17,10 @@
           <el-button size="mini" @click="formCancel">取 消</el-button>
           <el-button v-if="~[0, 1].indexOf(formDialogType)" size="mini" @click="formConfirm" type="primary">确
             定</el-button>
-          <el-button v-if="~[3].indexOf(formDialogType)" size="mini" @click="passExamination"
+          <el-button v-if="~[3].indexOf(formDialogType)" size="mini" @click="passExamination('OK')"
             type="primary">审核通过</el-button>
+          <el-button v-if="~[3].indexOf(formDialogType)" size="mini" @click="passExamination('FAIL')"
+            type="primary">驳回</el-button>
         </div>
       </el-dialog>
     </div>
@@ -136,11 +138,11 @@ export default {
         }
       })
     },
-    passExamination() {
+    passExamination(flag) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          websitPurchaseRetConfirm({ purchaseRetId: this.formData.purchaseRetId, flag: "OK" }).then(res => {
-            this.$message({ type: 'success', message: `审核通过!` })
+          websitPurchaseRetConfirm({ purchaseRetId: this.formData.purchaseRetId, flag: flag }).then(res => {
+            this.$message({ type: 'success', message: flag=='OK'?`审核通过!`:'驳回通过' })
             this.formCancel()
             this.$refs.pageRef.refreshList()
           })

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -475,14 +475,16 @@ export default {
             rules: []
           }
         }, {
-          name: 'el-select',
+          name: 'zj-select',
           options: this.workerList,
           md: 6,
           attributes: {
             disabled: this.formEdit,
             placeholder: '请选择',
             clearable: true,
-            filterable: true
+            filterable: true,
+            blurNoMatchText:true,
+            blurNoMatchInputBorderColor:""
           },
           formItemAttributes: {
             label: '工程师1名称',
@@ -491,16 +493,22 @@ export default {
           },
           events: {
             change: (val) => {
-              var data = this.workerList.find(item => item.value == val).data
-              this.formData.workerName1 = data?.workerName || ""
-              this.formData.workerMobile1 = data?.workerMobile || ""
+              var data = this.workerList.find(item => item.value == val)?.data
+              if(data){
+                this.formData.workerName1 = data?.workerName || ""
+                this.formData.workerMobile1 = data?.workerMobile || ""
+              }else{
+                this.formData.workerName1 = val
+                this.formData.workerMobile1 = ""
+              }
             }
           },
         }, {
           name: 'el-input',
           md: 6,
           attributes: {
-            disabled: true,
+            disabled: this.formEdit,
+            placeholder: '请输入',
           },
           formItemAttributes: {
             label: '工程师1电话',
@@ -530,14 +538,16 @@ export default {
             rules: []
           }
         }, {
-          name: 'el-select',
+          name: 'zj-select',
           options: this.workerList,
           md: 6,
           attributes: {
             disabled: this.formEdit,
             placeholder: '请选择',
             clearable: true,
-            filterable: true
+            filterable: true,
+            blurNoMatchText:true,
+            blurNoMatchInputBorderColor:""
           },
           formItemAttributes: {
             label: '工程师2名称',
@@ -546,16 +556,22 @@ export default {
           },
           events: {
             change: (val) => {
-              var data = this.workerList.find(item => item.value == val).data
-              this.formData.workerName2 = data?.workerName || ""
-              this.formData.workerMobile2 = data?.workerMobile || ""
+              var data = this.workerList.find(item => item.value == val)?.data
+              if(data){
+                this.formData.workerName2 = data?.workerName || ""
+                this.formData.workerMobile2 = data?.workerMobile || ""
+              }else{
+                this.formData.workerName2 = val
+                this.formData.workerMobile2 = ""
+              }
             }
           },
         }, {
           name: 'el-input',
           md: 6,
           attributes: {
-            disabled: true,
+            disabled: this.formEdit,
+            placeholder: '请输入',
           },
           formItemAttributes: {
             label: '工程师2电话',
@@ -702,7 +718,19 @@ export default {
             return row.status != "YES"
           },
           click: ({ row, index, column }) => {
-            this.formData = { ...row }
+            this.formData = { 
+              ...row,
+              ...(()=>{
+                var obj = {}
+                if(!row.workerId1 && row.workerName1){
+                  obj.workerId1 = row.workerName1
+                }
+                if(!row.workerId2 && row.workerName2){
+                  obj.workerId2 = row.workerName2
+                }
+                return obj
+              })()
+            }
             this.formEdit = false
             this.formBool = true
             this.getWorkers()
@@ -725,7 +753,19 @@ export default {
         },
         details_mx: {
           click: ({ row, index, column }) => {
-            this.formData = { ...row }
+            this.formData = { 
+              ...row,
+              ...(()=>{
+                var obj = {}
+                if(!row.workerId1 && row.workerName1){
+                  obj.workerId1 = row.workerName1
+                }
+                if(!row.workerId2 && row.workerName2){
+                  obj.workerId2 = row.workerName2
+                }
+                return obj
+              })()
+            }
             this.formEdit = true
             this.formBool = true
             this.getWorkers()

src/views/engineerFeeSettlement/monthlyPayrollSummary/index.vue

@@ -305,7 +305,7 @@ export default {
       try {
         pam.params.push(
           { "param": "a.settle_month_wages_id", "compare": "=", "value": this.monthItem.id },
-          { "param": "month_settle_worker_id", "compare": "=", "value": this.workerItem.workerId }
+          { "param": "month_settle_worker_id", "compare": "=", "value": this.workerItem.workerName}
         )
         cb && cb(pam)
         return settleExpenseList(pam)

src/views/mallManagement/activity/coupon_index/index.vue

@@ -220,7 +220,7 @@ export default {
                     },
                     render: (h, { row, column, index }) => {
                       return <div style="box-sizing: border-box; padding: 6px;">
-                        {MEMBER_CURRENT_TYPE_FILTER(row.memberName)}
+                        {MEMBER_CURRENT_TYPE_FILTER(row.type)}
                       </div>
                     }
                   },

src/views/secondHandMall/activistOrder/details.vue

@@ -27,9 +27,11 @@
                         </el-radio-group>
                       </el-form-item>
                       <el-form-item v-if="~['GOODS','GOODS_REFUND'].indexOf(formTH.refundType)" label="退货数量" prop="refundNum" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                        {{(()=>{ if(formTH.refundType=="GOODS") formTH.refundPrice=""; })()}}
                         <el-input v-model="formTH.refundNum"></el-input>
                       </el-form-item>
                       <el-form-item v-if="~['REFUND','GOODS_REFUND'].indexOf(formTH.refundType)" label="退款金额" prop="refundPrice" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                        {{(()=>{ if(formTH.refundType=="REFUND") formTH.refundNum=""; })()}}
                         <el-input type="number" v-model="formTH.refundPrice"></el-input>
                       </el-form-item>
                       <el-form-item label="备注">
@@ -178,7 +180,10 @@ export default {
       detailsTypeCp: this.detailsType,
       // 退货退款表单
       formTH: {
-
+        refundType: "",
+        refundNum: "",
+        refundPrice: "",
+        refundRemark: "",
       },
       // 订单详情
       orderDetail: {

src/views/secondHandMall/orderManagement/details.vue

@@ -47,9 +47,11 @@
                           </el-radio-group>
                         </el-form-item>
                         <el-form-item v-if="~['GOODS','GOODS_REFUND'].indexOf(formTH.refundType)" label="退货数量" prop="refundNum" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                          {{(()=>{ if(formTH.refundType=="GOODS") formTH.refundPrice=""; })()}}
                           <el-input v-model="formTH.refundNum"></el-input>
                         </el-form-item>
                         <el-form-item v-if="~['REFUND','GOODS_REFUND'].indexOf(formTH.refundType)" label="退款金额" prop="refundPrice" :rules="[{ required: true, message: '请填写', trigger: 'blur' }]">
+                          {{(()=>{ if(formTH.refundType=="REFUND") formTH.refundNum=""; })()}}
                           <el-input type="number" v-model="formTH.refundPrice"></el-input>
                         </el-form-item>
                         <el-form-item label="备注">
@@ -232,7 +234,10 @@ export default {
       detailsTypeCp: this.detailsType,
       // 退货退款表单
       formTH: {
-
+        refundType: "",
+        refundNum: "",
+        refundPrice: "",
+        refundRemark: "",
       },
       // 收款表单
       formSK: {

src/views/setting/account/index.vue

@@ -4,7 +4,7 @@
       <div :style="{
         width: '100%',
         height: activeKey == 'list' ? '100%' : '0px',
-        overflow: 'hidden'
+        overflow: activeKey == 'list' ? 'auto' : 'hidden'
       }">
         <div class="app-container">
           <div class="setting_title">账户管理</div>