Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

spring

8 天以前 af7fa041da9f063ca49f1f1126ec01616f14cd85

 src/views/salesOutbound/index.vue

@@ -166,6 +166,15 @@
              />
            </el-form-item>
          </el-col>
           <el-col :span="12">
            <el-form-item label="附件上传：" prop="receiptPaymentDate">
              <SimpleMultiFileUpload
                  style="width: 100%"
                  v-model:ids="ids"
                  v-model:file-list="fileList"
              />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
@@ -180,6 +189,7 @@

<script setup>
import {ref, reactive, onMounted, nextTick} from "vue";
import SimpleMultiFileUpload from "@/components/FileUpload/SimpleMultiFileUpload.vue"
const { proxy } = getCurrentInstance()
const { receipt_payment_type } = proxy.useDict("receipt_payment_type");
import {Delete, Download, Plus} from "@element-plus/icons-vue";
@@ -199,6 +209,8 @@

const formDia = ref()
const activeTab = ref("out");
const ids = ref([])
const fileList = ref([])
// 标签页数据
const tabs = reactive([
  { name: "out", label: "销售出库" },
@@ -342,6 +354,7 @@
const submitForm = () => {
  proxy.$refs["formRef"].validate((valid) => {
    if (valid) {
      former.value.attachUpload = ids.value.join(",")
      receiptPaymentSaveOrUpdate(former.value).then((res) => {
        proxy.$modal.msgSuccess("提交成功");
        closeDia();