Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/auxiliaryFittings/salesManagement/components/attachmentNewReturnDetail.vue

@@ -161,7 +161,7 @@
 		<div class="page-footer">
 			<div class="footer">
 				<el-button v-if="formType == 0 || (formType == 1 && formData.flag == 'SAVE')" size="small" type="primary" @click="save()">保存</el-button>
-				<el-button v-if="formType == 0 || (formType == 1 && formData.flag == 'SAVE')" size="small" type="primary" @click="submit()">提交</el-button>
+				<el-button v-if="formType != 0 && formData.flag == 'SAVE'" size="small" type="primary" @click="submit()">提交</el-button>
 				<el-button v-if="formData.flag == 'SUBMIT'" size="small" type="primary"  @click="confirm()">确认收货</el-button>
 				<el-button size="small" type="info" @click="goBack">返回</el-button>
 			</div>

src/views/auxiliaryFittings/salesManagement/components/attachmentOldReturnDetail.vue

@@ -161,7 +161,7 @@
 		<div class="page-footer">
 			<div class="footer">
 				<el-button v-if="formType == 0 || (formType == 1 && formData.flag == 'SAVE')" size="small" type="primary" @click="save()">保存</el-button>
-				<el-button v-if="formType == 0 || (formType == 1 && formData.flag == 'SAVE')" size="small" type="primary" @click="submit()">提交</el-button>
+				<el-button v-if="formType != 0 && formData.flag == 'SAVE'" size="small" type="primary" @click="submit()">提交</el-button>
 				<el-button v-if="formData.flag == 'SUBMIT'" size="small" type="primary"  @click="confirm()">确认收货</el-button>
 				<el-button size="small" type="info" @click="goBack">返回</el-button>
 			</div>

src/views/auxiliaryFittings/settleAccountManagement/salesWithdraw/index.vue

@@ -6,8 +6,8 @@
 	  <div slot="moreSearch">
 	    <el-radio-group v-model="status" size="mini" @change="changeType">
 	    	<el-radio-button label="">全部</el-radio-button>
-	    	<el-radio-button :label="0">待发放</el-radio-button>
-	    	<el-radio-button :label="1">已发放</el-radio-button>
+	    	<el-radio-button label="0">待发放</el-radio-button>
+	    	<el-radio-button label="1">已发放</el-radio-button>
 	    </el-radio-group>
 	    <br><br>
 	  </div>
@@ -111,7 +111,7 @@
 			</el-card>
 		  <div slot="footer" class="dialog-footer">
 			<el-button size="mini" @click="formDialog = false;formData = {}">取 消</el-button>
-			<el-button size="mini" v-if="formData.status == 0" type="primary" @click="update(formData.id)">设为已发</el-button>
+			<el-button size="mini" v-if="formData.status == 0" type="primary" @click="update(formData.id, formData.certImg)">设为已发</el-button>
 		  </div>
 		</el-dialog>
 	</template-page>
@@ -164,12 +164,13 @@ export default {
 	  this.$refs.pageRef.refreshList()
 	},
     // 列表请求函数
-	getList(p) {
+	getList(p,cb) {
 	  try {
 	    var pam = JSON.parse(JSON.stringify(p))
-	    if (this.status) {
+	    if (this.status || this.status >= 0) {
 	      pam.params.push({ "param": "a.status", "compare": "=", "value": this.status })
 	    }
+		cb && cb(pam)
 	    return listPageV2(pam)
 	  } catch (error) {
 	    console.log(error)
@@ -213,19 +214,19 @@ export default {
 		    })
 		  }}>查看</el-button>
 		  {row.status == 0? <el-button type="text" onClick={() => {
-		  	this.update(row.id)
+		  	this.update(row.id, row.certImg)
 		  }}>设为已发</el-button>:null}
 		  
         </div>
       )
     },
-	update(id){
+	update(id, certImg){
 		this.$confirm('请确认是否设为已发放, 是否继续?', '提示', {
 			confirmButtonText: '确定',
 			cancelButtonText: '取消',
 			type: 'warning'
 		}).then(() => {
-			refund({ id }).then(res => {
+			update({ id, certImg }).then(res => {
 			  if (res.code == 200) {
 			  	this.$message({ type: 'success', message: '设为已发放成功!' })
 			  	this.$refs.pageRef.refreshList()