Merge remote-tracking branch 'origin/master'

src/layout/components/RealNameAuthentication.vue

@@ -38,11 +38,11 @@
               <el-icon v-else class="avatar-uploader-icon">
                 <Plus />
               </el-icon>
-              <template #tip>
-                <div class="el-upload__tip">
-                  {{ item.placeholder }}
-                </div>
-              </template>
+<!--              <template #tip>-->
+<!--                <div class="el-upload__tip">-->
+<!--                  {{ item.placeholder }}-->
+<!--                </div>-->
+<!--              </template>-->
             </el-upload>
           </div>
           <div v-else>
@@ -143,6 +143,7 @@
         const params = {
           userType: 'PERSONAL',
           userIdImgUrl: form.value.userIdImgUrl,
+          userIdBackImgUrl: form.value.userIdBackImgUrl,
           idNum: form.value.idNum,
           userName: form.value.name,
           address: form.value.address,
@@ -226,6 +227,15 @@
       widthImg: 350,
       height: 210
     },
+    {
+      prop: "userIdBackImgUrl",
+      label: "身份证背面照",
+      type: 'uploadImg',
+      formLabelWidth,
+      width: '80%',
+      widthImg: 350,
+      height: 210
+    },
     {
       prop: "",
       label: "",

src/views/inventoryControl/newInventory/warehouseManagement/index.vue

@@ -217,6 +217,7 @@ function getList() {
 
 const Adds = () => {
   itemStartValue.value = 1
+  getUpperWarehouseIdList()
 }
 //表单编辑按钮
 function handleEdit(idx: any, row: any) {

src/views/onlineBusinessHall/productManagement/releaseProduct/index.vue

@@ -6,7 +6,7 @@
       @submit="submit" @lazySelectorSelection="lazySelectorSelection" @completeAudit="completeAudit"
       @handleChangeRecord="handleChangeRecord" @handleInfo="handleInfo" @handleChangeInfo="handleChangeInfo"
       @handleChangeInfoAudit="handleChangeInfo" :isEditCollapse="true" :editCollapseArray="editCollapseArray"
-      :defaultActiveNames="['3']"
+      :defaultActiveNames="['1']"
       @pageSizeChange="
           (val) => {
             field.paging.currentPage = 1

src/views/system/agency/index.vue

@@ -67,13 +67,15 @@
                             <template v-slot="scope">
                                 <el-upload v-if="typeOption!=='info'" ref="upload" :file-list="scope.row.fileList" style="padding-top: 9px;"
                                     :limit="1" :on-exceed="handleExceed" class="upload-demo" :data="data"
-                                    :action="uploadUrl" @success="onSuccess($event, scope.row)">
+                                    :action="uploadUrl" @success="onSuccess($event, scope.row)" accept=".pdf,.doc,.docx,.xls,.xlsx"
+                                    :on-remove="(file, fileList) => handleRemove(file, fileList, scope.row)">
                                     <el-button size="small" type="primary" icon="upload">
                                         上传附件
                                     </el-button>
                                 </el-upload>
                               <view v-else>
-                                <el-link underline v-for="item in scope.row.fileList" :herf="item.url" type="primary">{{item.name}}</el-link>
+                                <el-link underline v-for="item in scope.row.fileList" :href="item.url"
+                                         target="_blank" rel="noopener noreferrer" type="primary">{{item.name}}</el-link>
                               </view>
                             </template>
                         </el-table-column>
@@ -804,10 +806,19 @@ const url = import.meta.env.VITE_APP_UPLOAD_URL
 const handleExceed: UploadProps['onExceed'] = (files) => {
     ElMessage.error('只能上传一条附件！')
 }
+
+const handleRemove = (file, fileList, row) => {
+  row.agreementAnnex = "";
+  console.log('Rrow', row)
+  console.log('RdataForm.configSetInfos', dataForm.configSetInfos)
+}
+
 function onSuccess(response: any, row: any) {
     // import.meta.env.VITE_APP_UPLOAD_URL + 
     // row.agreementAnnex =  response.data.ossFilePath
     row.agreementAnnex = response.data.ossFilePath
+  console.log('Srow', row)
+  console.log('SdataForm.configSetInfos', dataForm.configSetInfos)
 }
 
 onMounted(() => {

src/views/system/userManage/index.vue

@@ -97,7 +97,7 @@
       </template>
     </crud-template>
     <RealNameAuthentication @success="successfulCertification" v-model="AuthenticationVisible"
-      :staffOpenId="staffOpenId" />
+      :customerOpenId="staffOpenId" />
     <BatchAuth v-model="isBatch" :dataListArr="batchList" @closed="cancelBatch" @refresh-list="getList"
       v-if="isBatchShow" />
   </div>
@@ -433,6 +433,7 @@
   const staffOpenId = ref()
   function realNameAuthentication(row) {
     AuthenticationVisible.value = true
+    console.log("===>row",row)
     staffOpenId.value = row.staffOpenId
   }
   function successfulCertification() {