Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhny_web

shuishen

2022-08-02 cbf3c629bfcb8c381c7e96b6d92eaef7bff9b8e4

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhny_web

 src/views/farmplant/process.vue

@@ -186,7 +186,7 @@
                </template>
                <template slot="menuForm">
                    <div style="text-align: center">
                        <el-button style="width: 80px" plain @click="cleanKCData">取消</el-button>
                        <el-button style="width: 80px" plain @click="cleanJGData">取消</el-button>
                        <el-button style="width: 80px" type="success" plain @click="submitJGloss">确认</el-button>
                    </div>
                </template>
@@ -239,6 +239,7 @@
                </template>
                <template slot="menuForm">
                    <div style="text-align: center">
                        <el-button style="width: 80px" plain @click="cleanCKData">取消</el-button>
                        <el-button style="width: 120px" type="success" plain @click="submitCK">出库</el-button>
                    </div>
                </template>
@@ -790,28 +791,28 @@
            })
        },
        //出库表单提交
        submitCK () {
            var that = this
            this.$refs.form.validate((vaild, done) => {
                if (vaild) {
                    addck(this.formCK).then(() => {
                        this.onLoad(this.page)
                        this.$message({
                            type: "success",
                            message: "操作成功!"
                        })
                        //提交完成，关闭窗口清空数据
                        that.cleanCKData()
                        done()
                    }, error => {
                        window.console.log(error)
                        //提交失败，关闭窗口清空数据
                        that.cleanCKData()
                        done()
                    })
                }
            })
        },
        // submitCK () {
        //     var that = this
        //     this.$refs.form.validate((vaild, done) => {
        //         if (vaild) {
        //             addck(this.formCK).then(() => {
        //                 this.onLoad(this.page)
        //                 this.$message({
        //                     type: "success",
        //                     message: "操作成功!"
        //                 })
        //                 //提交完成，关闭窗口清空数据
        //                 that.cleanCKData()
        //                 done()
        //             }, error => {
        //                 window.console.log(error)
        //                 //提交失败，关闭窗口清空数据
        //                 that.cleanCKData()
        //                 done()
        //             })
        //         }
        //     })
        // },
        handleChange (value) {
            if (value != null) {
                this.form.saleDestination = value[0]
@@ -897,10 +898,12 @@
            that.$refs.form.resetFields()
            that.visibleJG = false
        },
        cleanKCData () {
        //出库
        cleanCKData () {
            var that = this
            that.formCK.saleDestination = ""
            that.$refs.form.resetFields()
            that.visibleKC = false
            that.visibleCK = false
        },
        handleSizeChange (val) {
            this.page.pageSize = val