pengyh 1 год назад
Родитель
Сommit
74ecf240d5

+ 20 - 10
src/components/Shortcut/index.vue

@@ -9,7 +9,7 @@
         <span>移动端</span>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
-        <el-dropdown-item disabled v-for="(item, index) in QRcodeList" :key="index">
+        <el-dropdown-item v-for="(item, index) in QRcodeList" :key="index">
           <div class="QRcode">
             <el-image class="QRcode-img" :src="item.codeUrl" :preview-src-list="[item.codeUrl]" fit="fill"></el-image>
             <div>
@@ -128,15 +128,15 @@ export default {
     commonCompanywechatGet({ id: this.userInfo.companyWechatId }).then(res => {
       console.log(res)
       this.QRcodeList = []
-      // if (res?.data?.qrcode1) {
-      //   this.QRcodeList.push({
-      //     codeUrl: res.data.qrcode1,
-      //     name: "小程序",
-      //     saleName: "",
-      //     iosIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/16976801488369080b52c-a1e6-40a0-83f9-8e04f12b494e.jpg",
-      //     androidIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/1697680143828d678a6e5-307d-47d0-8ee9-1698f100feb4.jpg"
-      //   })
-      // }
+      if (res?.data?.qrcode1) {
+        this.QRcodeList.push({
+          codeUrl: res.data.qrcode1,
+          name: "小程序",
+          saleName: "",
+          iosIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/16976801488369080b52c-a1e6-40a0-83f9-8e04f12b494e.jpg",
+          androidIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/1697680143828d678a6e5-307d-47d0-8ee9-1698f100feb4.jpg"
+        })
+      }
       if (res?.data?.qrcode2) {
         this.QRcodeList.push({
           codeUrl: res.data.qrcode2,
@@ -146,6 +146,15 @@ export default {
           androidIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/1697680143828d678a6e5-307d-47d0-8ee9-1698f100feb4.jpg"
         })
       }
+	  if (res?.data?.payQrcode) {
+	    this.QRcodeList.push({
+	      codeUrl: res.data.payQrcode,
+	      name: "收款码",
+	      saleName: "",
+	      iosIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/16976801488369080b52c-a1e6-40a0-83f9-8e04f12b494e.jpg",
+	      androidIcon: "https://fw.gd-jxm.com/gateway/pcapi/img/get?key=2023-10/1697680143828d678a6e5-307d-47d0-8ee9-1698f100feb4.jpg"
+	    })
+	  }
     })
   },
   beforeDestroy() {
@@ -799,6 +808,7 @@ ul {
   display: flex;
   flex-direction: row;
   align-items: center;
+  margin-bottom: 20px;
 }
 
 .QRcode-img {

+ 1 - 1
src/views/auxiliaryFittings/projectAttachmentManage/detail.vue

@@ -223,7 +223,7 @@
 				rules1: {
 					price: [
 						{ required: true, message: '请输入收款金额', trigger: 'blur' },
-						{ pattern:/^[1-9]\d*(\.\d+)?$|^0\.[1-9]\d*$/, message: '请输入大于0的数字', trigger: 'blur' }
+						{ pattern:/^[1-9]\d*(\.\d+)?$|^0\.[0-9]\d*$/, message: '请输入大于0的数字', trigger: 'blur' }
 					],
 					fileUrl: [
 						{ required: true, message: '请上传收款凭证', trigger: 'change' }

+ 1 - 1
src/views/auxiliaryFittings/projectAuxiliaryManage/detail.vue

@@ -223,7 +223,7 @@
 				rules1: {
 					price: [
 						{ required: true, message: '请输入收款金额', trigger: 'blur' },
-						{ pattern:/^[1-9]\d*(\.\d+)?$|^0\.[1-9]\d*$/, message: '请输入大于0的数字', trigger: 'blur' }
+						{ pattern:/^[1-9]\d*(\.\d+)?$|^0\.[0-9]\d*$/, message: '请输入大于0的数字', trigger: 'blur' }
 					],
 					fileUrl: [
 						{ required: true, message: '请上传收款凭证', trigger: 'change' }

+ 15 - 8
src/views/auxiliaryFittings/salesManagement/components/attachmentNewReturnDetail.vue

@@ -270,7 +270,7 @@
 		<el-dialog title="选择销售订单" :visible.sync="isShowNo" width="80%" :close-on-click-modal="false" :modal-append-to-body="false" @close="close">
 			<el-form ref="formData1" :model="formData1" label-width="110px" size="small" label-position="left">
 				<el-row :gutter="20">
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="网点名称" prop="websit_id">
 							<el-select v-model="formData1.websit_id" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -282,7 +282,7 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="师傅姓名" prop="worker_name">
 							<el-select v-model="formData1.worker_name" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
@@ -296,14 +296,14 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="师傅联系电话" prop="worker_mobile">
 							<el-input type="text" v-model="formData1.worker_mobile" placeholder="请输入"></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="物料名称" prop="goods" align="center">
-							<el-select v-model="formData1.goods" @focus="()=>{
+							<el-select v-model="formData1.goods" filterable @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -315,6 +315,11 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :span="6">
+						<el-form-item label="销售订单号" prop="sales_id">
+							<el-input type="text" v-model="formData1.sales_id" placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
 					<!-- <el-col :span="8">
 						<el-form-item label="规格型号" align="center">
 							<el-select v-model="formData1.goods" @focus="()=>{
@@ -329,9 +334,9 @@
 							  </el-select>
 						</el-form-item>
 					</el-col> -->
-					<el-col :span="16">
+					<el-col :span="18">
 						<el-row type="flex" justify="end">
-							<el-col :span="4">
+							<el-col :span="3">
 								<el-button size="small" @click="resetScreenForm()">清空</el-button>
 								<el-button size="small" type="primary" @click="submitScreenForm()">搜索</el-button>
 							</el-col>
@@ -455,6 +460,7 @@
 					websit_id: '',
 					worker_name: '',
 					worker_mobile: '',
+					sales_id: '',
 					goods: {},
 					goodsName: '',
 					goodsSpecification: ''
@@ -544,7 +550,7 @@
 				this.getDetail(this.selectedRow.salesId)
 			},
 			getOrderList(){
-				listPageV2({pageNum: this.pageNum,pageSize: this.pageSize,params: [{param: 'a.flag',compare: '=',value: 'PAY_TAKE'},{param: "a.goods_type", compare: "=", value: "P"},{param: 'a.websit_id',compare: '=',value: this.formData1.websit_id},{param: 'a.worker_name',compare: '=',value: this.formData1.worker_name},{param: 'a.worker_mobile',compare: '=',value: this.formData1.worker_mobile}], goodsName: this.formData1.goods.goodsName, goodsSpecification: this.formData1.goods.goodsSpecification}).then(res => {
+				listPageV2({pageNum: this.pageNum,pageSize: this.pageSize,params: [{param: 'a.sales_id',compare: '=',value: this.formData1.sales_id},{param: 'a.flag',compare: '=',value: 'PAY_TAKE'},{param: "a.goods_type", compare: "=", value: "P"},{param: 'a.websit_id',compare: '=',value: this.formData1.websit_id},{param: 'a.worker_name',compare: '=',value: this.formData1.worker_name},{param: 'a.worker_mobile',compare: '=',value: this.formData1.worker_mobile}], goodsName: this.formData1.goods.goodsName, goodsSpecification: this.formData1.goods.goodsSpecification, isFilter: true}).then(res => {
 					this.orderList = res.data.records
 					this.listTotal = res.data.total
 				})
@@ -591,6 +597,7 @@
 				// this.formData.websitName = e.name
 				this.getWorker()
 				this.getGoodsList()
+				this.formData1.goods = {}
 				// this.getCategory(e.websitId)
 			},
 			async getGoods(goodsName,type){

+ 15 - 8
src/views/auxiliaryFittings/salesManagement/components/attachmentOldReturnDetail.vue

@@ -342,7 +342,7 @@
 		<el-dialog title="选择销售订单" :visible.sync="isShowNo" width="80%" :close-on-click-modal="false" :modal-append-to-body="false" @close="close">
 			<el-form ref="formData1" :model="formData1" label-width="110px" size="small" label-position="left">
 				<el-row :gutter="20">
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="网点名称" prop="websit_id">
 							<el-select v-model="formData1.websit_id" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -354,7 +354,7 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="师傅姓名" prop="worker_name">
 							<el-select v-model="formData1.worker_name" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
@@ -368,14 +368,14 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="师傅联系电话" prop="worker_mobile">
 							<el-input type="text" v-model="formData1.worker_mobile" placeholder="请输入"></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="物料名称" prop="goods" align="center">
-							<el-select v-model="formData1.goods" @focus="()=>{
+							<el-select v-model="formData1.goods" filterable @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -387,6 +387,11 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :span="6">
+						<el-form-item label="销售订单号" prop="sales_id">
+							<el-input type="text" v-model="formData1.sales_id" placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
 					<!-- <el-col :span="8">
 						<el-form-item label="规格型号" align="center">
 							<el-select v-model="formData1.goods" @focus="()=>{
@@ -401,9 +406,9 @@
 							  </el-select>
 						</el-form-item>
 					</el-col> -->
-					<el-col :span="16">
+					<el-col :span="18">
 						<el-row type="flex" justify="end">
-							<el-col :span="4">
+							<el-col :span="3">
 								<el-button size="small" @click="resetScreenForm()">清空</el-button>
 								<el-button size="small" type="primary" @click="submitScreenForm()">搜索</el-button>
 							</el-col>
@@ -529,6 +534,7 @@
 					websit_id: '',
 					worker_name: '',
 					worker_mobile: '',
+					sales_id: '',
 					goods: {},
 					goodsName: '',
 					goodsSpecification: ''
@@ -624,7 +630,7 @@
 				this.getDetail(this.selectedRow.salesId)
 			},
 			getOrderList(){
-				listPageV2({pageNum: this.pageNum,pageSize: this.pageSize,params: [{param: 'a.flag',compare: '=',value: 'PAY_TAKE'},{param: "a.goods_type", compare: "=", value: "P"},{param: 'a.websit_id',compare: '=',value: this.formData1.websit_id},{param: 'a.worker_name',compare: '=',value: this.formData1.worker_name},{param: 'a.worker_mobile',compare: '=',value: this.formData1.worker_mobile}], goodsName: this.formData1.goods.goodsName, goodsSpecification: this.formData1.goods.goodsSpecification}).then(res => {
+				listPageV2({pageNum: this.pageNum,pageSize: this.pageSize,params: [{param: 'a.sales_id',compare: '=',value: this.formData1.sales_id},{param: 'a.flag',compare: '=',value: 'PAY_TAKE'},{param: "a.goods_type", compare: "=", value: "P"},{param: 'a.websit_id',compare: '=',value: this.formData1.websit_id},{param: 'a.worker_name',compare: '=',value: this.formData1.worker_name},{param: 'a.worker_mobile',compare: '=',value: this.formData1.worker_mobile}], goodsName: this.formData1.goods.goodsName, goodsSpecification: this.formData1.goods.goodsSpecification, isFilter: true}).then(res => {
 					this.orderList = res.data.records
 					this.listTotal = res.data.total
 				})
@@ -671,6 +677,7 @@
 				// this.formData.websitName = e.name
 				this.getWorker()
 				this.getGoodsList()
+				this.formData1.goods = {}
 				// this.getCategory(e.websitId)
 			},
 			async getGoods(goodsName,type){

+ 1 - 1
src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -595,7 +595,7 @@
 				this.dataList.splice(index,1)
 			},
 			confirmSubmit(){
-				if(this.formData1.price && !/^[1-9]\d*(\.\d+)?$|^0\.[1-9]\d*$/.test(this.formData1.price)){
+				if(this.formData1.price && !/^[1-9]\d*(\.\d+)?$|^0\.[0-9]\d*$/.test(this.formData1.price)){
 					return this.$message.warning('请输入大于0的数字!')
 				}
 				this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {

+ 1 - 1
src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -670,7 +670,7 @@
 				this.dataList.splice(index,1)
 			},
 			confirmSubmit(){
-				if(this.formData1.price && !/^[1-9]\d*(\.\d+)?$|^0\.[1-9]\d*$/.test(this.formData1.price)){
+				if(this.formData1.price && !/^[1-9]\d*(\.\d+)?$|^0\.[0-9]\d*$/.test(this.formData1.price)){
 					return this.$message.warning('请输入大于0的数字!')
 				}
 				this.$confirm(`请确定是否提交订单, 是否继续?`, '提示', {

+ 17 - 10
src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesReturnOrderDetail.vue

@@ -294,7 +294,7 @@
 		<el-dialog title="选择销售订单" :visible.sync="isShowNo" width="80%" :close-on-click-modal="false" :modal-append-to-body="false" @close="close">
 			<el-form ref="formData1" :model="formData1" label-width="110px" size="small" label-position="left">
 				<el-row :gutter="20">
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="网点名称" prop="websit_id">
 							<el-select v-model="formData1.websit_id" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -306,7 +306,7 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="师傅姓名" prop="worker_name">
 							<el-select v-model="formData1.worker_name" @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
@@ -320,14 +320,14 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="师傅联系电话" prop="worker_mobile">
 							<el-input type="text" v-model="formData1.worker_mobile" placeholder="请输入"></el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="物料名称" prop="goods" align="center">
-							<el-select v-model="formData1.goods" @focus="()=>{
+							<el-select v-model="formData1.goods" filterable @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -339,9 +339,9 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
 						<el-form-item label="规格型号" prop="goods" align="center">
-							<el-select v-model="formData1.goods" @focus="()=>{
+							<el-select v-model="formData1.goods" filterable @focus="()=>{
 								if(!this.formData1.websit_id){return this.$message.warning('请先选择网点名称!');}
 							}" value-key="goodsId" placeholder="请选择" style="width: 100%;">
 							    <el-option
@@ -353,9 +353,14 @@
 							  </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">
+					<el-col :span="6">
+						<el-form-item label="销售订单号" prop="sales_id">
+							<el-input type="text" v-model="formData1.sales_id" placeholder="请输入"></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
 						<el-row type="flex" justify="end">
-							<el-col :span="7">
+							<el-col :span="5">
 								<el-button size="small" @click="resetScreenForm()">清空</el-button>
 								<el-button size="small" type="primary" @click="submitScreenForm()">搜索</el-button>
 							</el-col>
@@ -480,6 +485,7 @@
 					websit_id: '',
 					worker_name: '',
 					worker_mobile: '',
+					sales_id: '',
 					goods: {},
 					goodsName: '',
 					goodsSpecification: ''
@@ -579,7 +585,7 @@
 				this.getDetail(this.selectedRow.salesId)
 			},
 			getOrderList(){
-				listPageV2({pageNum: this.pageNum,pageSize: this.pageSize,params: [{param: 'a.flag',compare: '=',value: 'PAY_TAKE'},{param: "a.goods_type", compare: "=", value: "M"},{param: 'a.websit_id',compare: '=',value: this.formData1.websit_id},{param: 'a.worker_name',compare: '=',value: this.formData1.worker_name},{param: 'a.worker_mobile',compare: '=',value: this.formData1.worker_mobile}], goodsName: this.formData1.goods.goodsName, goodsSpecification: this.formData1.goods.goodsSpecification}).then(res => {
+				listPageV2({pageNum: this.pageNum,pageSize: this.pageSize,params: [{param: 'a.sales_id',compare: '=',value: this.formData1.sales_id},{param: 'a.flag',compare: '=',value: 'PAY_TAKE'},{param: "a.goods_type", compare: "=", value: "M"},{param: 'a.websit_id',compare: '=',value: this.formData1.websit_id},{param: 'a.worker_name',compare: '=',value: this.formData1.worker_name},{param: 'a.worker_mobile',compare: '=',value: this.formData1.worker_mobile}], goodsName: this.formData1.goods.goodsName, goodsSpecification: this.formData1.goods.goodsSpecification, isFilter: true}).then(res => {
 					this.orderList = res.data.records
 					this.listTotal = res.data.total
 				})
@@ -624,6 +630,7 @@
 			changeWebsit(e){
 				this.getWorker()
 				this.getGoodsList()
+				this.formData1.goods = {}
 				// this.getCategory(e.websitId)
 			},
 			getCategory(websitId){

+ 6 - 6
src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -793,15 +793,15 @@ export default {
       })
     },
     submitStep5Form() {
-      if (!this.qrcode1_url) {
-        return this.$errorMsg('请上传小程序图片');
-      }
+      // if (!this.qrcode1_url) {
+      //   return this.$errorMsg('请上传小程序图片');
+      // }
       if (!this.qrcode2_url) {
         return this.$errorMsg('请上传公众号图片');
       }
-			if (!this.qrcode3_url) {
-			  return this.$errorMsg('请上传收款二维码图片');
-			}
+	  // if (!this.qrcode3_url) {
+	  //   return this.$errorMsg('请上传收款二维码图片');
+	  // }
       this.formLoading = true;
       let params = {
         adminUserId: this.id,