snow 1 gadu atpakaļ
vecāks
revīzija
9b62ae2239

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 8 - 0
dist/static/js/0.js


+ 850 - 0
src/views/netOrderEntry/netOrderEnter/detail-modal.vue

@@ -0,0 +1,850 @@
+<template>
+  <el-dialog
+    v-loading="loading || detailLoading"
+    :title="title"
+    :center="true"
+    align="left"
+    top="10vh"
+    width="1040px"
+    :close-on-click-modal="false"
+    :visible.sync="showModelThis"
+    element-loading-text="拼命加载中"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="handleClose"
+  >
+    <el-card style="margin: -20px 0 0 0">
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-form
+            ref="ruleForm"
+            :model="ruleForm"
+            status-icon
+            :rules="rulesThis"
+            label-width="80px"
+            class="demo-ruleForm"
+            size="mini"
+          >
+            <el-divider>
+              <el-tag size="mini">销售订单信息</el-tag>
+            </el-divider>
+
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="商品分类" prop="cat_id">
+                  <company-sort
+                    :value="ruleForm.cat_id"
+                    :placeholder="'商品分类'"
+                    :disabled="id !== '003'"
+                    :size="'mini'"
+                    :company-no="ruleForm.companyNo"
+                    :names="cat_id_name"
+                    :is-detail="type !== 'add'"
+                    @searchChange="goods_class_change"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="7">
+                <el-form-item label="采购员" prop="buyerid">
+                  <search-account
+                    size="mini"
+                    placeholder="采购员"
+                    level="2"
+                    :value="ruleForm.buyerid"
+                    :names="ruleForm.buyer_name"
+                    :is-detail="true"
+                    @searchChange="handleHandoverName"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <el-col :span="12">
+                <el-form-item label="所属平台" prop="platform_id">
+                  <search-terrace
+                    :value="ruleForm.platform_id"
+                    :disabled="id !== '003'"
+                    :size="'mini'"
+                    :is-detail="falsse"
+                    :is_show="'0'"
+                    :placeholder="'所属平台'"
+                    @searchChange="platform_codesearchChange"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="单据号" prop="workCode">
+                  <el-input
+                    v-model="ruleForm.workCode"
+                    :disabled="id === '007'"
+                    maxlength="50"
+                    placeholder="单据号"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="PO编号" prop="poCode">
+                  <el-input
+                    v-model="ruleForm.poCode"
+                    placeholder="PO编号"
+                    maxlength="50"
+                    :disabled="id === '007'"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="购买方公司" label-width="100px" prop="khNo">
+                  <search-customer
+                    size="mini"
+                    :names="khName"
+                    :disabled="id !== '003'"
+                    :is-detail="type !== 'add'"
+                    :value="ruleForm.khNo"
+                    placeholder="购买方公司"
+                    @searchChange="handleCustomerChange"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="12">
+                <el-form-item label="销售方公司" label-width="100px" prop="companyNo">
+                  <search-work-company
+                    disabled
+                    :value="ruleForm.companyNo"
+                    :names="''"
+                    :size="'mini'"
+                    :placeholder="'销售方公司'"
+                    @searchChange="handleCompanyChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-divider>
+              <el-tag size="mini">收货信息</el-tag>
+            </el-divider>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="收货人" prop="contactor">
+                  <el-input
+                    v-model="ruleForm.contactor"
+                    :disabled="id === '007'"
+                    placeholder="收货人"
+                    maxlength="30"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8">
+                <el-form-item label="联系电话" prop="mobile">
+                  <el-input
+                    v-model="ruleForm.mobile"
+                    :disabled="id === '007'"
+                    placeholder="联系电话"
+                    maxlength="11"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <!-- <el-col :span="12">
+                <el-form-item label="收货省市区" prop="addr_code" label-width="100px">
+                  <select-area
+                    size="mini"
+                    :value="ruleForm.addr_code"
+                    placeholder="收货省市区"
+                    :disabled="id === '007'"
+                    @selectChange="select_area_change($event)"
+                  />
+                </el-form-item>
+              </el-col> -->
+
+              <el-col :span="8">
+                <el-form-item label="发货时间" prop="sendtime">
+                  <el-date-picker
+                    v-model="ruleForm.sendtime"
+                    value-format="yyyy-MM-dd"
+                    :disabled="id === '007'"
+                    type="datetime"
+                    placeholder="发货时间"
+                    style="width: 100%"
+                    :picker-options="pickerOptions"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="联系地址" prop="addr">
+                  <el-input
+                    v-model="ruleForm.addr"
+                    :disabled="id === '007'"
+                    maxlength="100"
+                    placeholder="联系地址"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-divider>
+              <el-tag size="mini">商品信息</el-tag>
+            </el-divider>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="供应商公司" label-width="100px" prop="supplierNo">
+                  <search-supplier
+                    size="mini"
+                    placeholder="供应商公司"
+                    :value="ruleForm.supplierNo"
+                    :names="supplierName"
+                    :disabled="id === '007'"
+                    :is-detail="type !== 'add'"
+                    @searchChange="handleSupplierChange"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="商品名称" prop="goodName">
+                  <el-input
+                    v-model="ruleForm.goodName"
+                    placeholder="商品名称"
+                    maxlength="50"
+                    :disabled="id !== '003'"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="数量" prop="goodNum" label-width="60px">
+                  <el-input-number
+                    v-model="ruleForm.goodNum"
+                    :disabled="id !== '003'"
+                    style="width: 100%"
+                    controls-position="right"
+                    placeholder="数量"
+                    :precision="0"
+                    :min="0"
+                    :step="1"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="销售总额" prop="sale_total">
+                  <!-- <el-input v-model="ruleForm.sale_total" placeholder="销售总额">
+                    <template #append>元</template>
+                  </el-input> -->
+                  <el-input-number
+                    v-model="ruleForm.sale_total"
+                    :disabled="id !== '003'"
+                    style="width: 100%"
+                    controls-position="right"
+                    placeholder="销售总额"
+                    :precision="2"
+                    :min="0"
+                    :step="0.01"
+                    @change="number_change_total($event, 'sale_total')"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="采购总额" prop="cgd_total">
+                  <el-input-number
+                    v-model="ruleForm.cgd_total"
+                    :disabled="id !== '003'"
+                    style="width: 100%"
+                    controls-position="right"
+                    placeholder="采购总额"
+                    :precision="2"
+                    :min="0"
+                    :step="0.01"
+                    @change="number_change_total($event, 'cgd_total')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="采购毛利率" label-width="100px" prop="cgd_tax">
+                  <!-- <el-input-number
+                    v-model="ruleForm.cgd_tax"
+                    style="width: 100%"
+                    :disabled="id === '007'"
+                    controls-position="right"
+                    placeholder="采购毛利率"
+                    :precision="2"
+                    :min="0"
+                    :max="100"
+                    :step="0.01"
+                    @change="number_change($event, 2)"
+                  /> -->
+                  <digital-input
+                    :values="ruleForm.cgd_tax"
+                    :placeholder="'采购毛利率'"
+                    :min="0"
+                    :max="100"
+                    :disabled="id === '007'"
+                    :position="'right'"
+                    :precision="2"
+                    :size="'mini'"
+                    :controls="false"
+                    :append="'%'"
+                    @reschange="number_change($event, 'cgd_tax')"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="6">
+                <el-form-item label="单位" prop="goodUnit" label-width="60px">
+                  <search-unit
+                    :value="ruleForm.goodUnit"
+                    disabled
+                    :size="'mini'"
+                    :is-detail="type !== 'add'"
+                    :names="unit_name"
+                    :placeholder="'单位'"
+                    @searchChange="unitsearchChange"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="销售单价" prop="goodPrice">
+                  <el-input-number
+                    v-model="ruleForm.goodPrice"
+                    :disabled="id !== '003'"
+                    style="width: 100%"
+                    controls-position="right"
+                    placeholder="单价"
+                    :precision="2"
+                    :min="0"
+                    :step="0.01"
+                    @change="number_change($event, 'goodPrice')"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="采购单价" prop="cgdPrice">
+                  <el-input-number
+                    v-model="ruleForm.cgdPrice"
+                    style="width: 100%"
+                    :disabled="id === '007'"
+                    controls-position="right"
+                    placeholder="采购单价"
+                    :precision="2"
+                    :min="0"
+                    :step="0.01"
+                    @change="number_change($event, 'cgdPrice')"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="6">
+                <el-form-item label="税率" prop="tax">
+                  <search-tax
+                    :disabled="id === '007'"
+                    :value="ruleForm.tax"
+                    :size="'mini'"
+                    :is-detail="type !== 'add'"
+                    :placeholder="'税点'"
+                    @searchChange="handleTaxChange"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-col>
+        <el-col :span="24" style="text-align: right">
+          <el-button
+            v-if="id !== '007'"
+            type="primary"
+            @click="submitForm"
+          >保 存</el-button>
+          <el-button @click="showModelThis = false">
+            {{ id == "007" ? "关 闭" : "取 消" }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+  </el-dialog>
+</template>
+<script>
+import asyncRequest from '@/apis/service/netOrderEntry/netOrderEnter'
+import companyHelper from '@/mixins/companyHelper'
+import { accMul, accDiv, accSub, isPhone, isMobile } from '@/utils/validate'
+import resToken from '@/mixins/resToken'
+
+const defaultData = {
+  addr_code: [],
+  cgd_total: '',
+  cgdPrice: '',
+  // buyerid: "",
+  // buyer_name: "",
+  platform_id: '',
+  cgd_tax: '',
+  workCode: '',
+  poCode: '',
+  khNo: '',
+  companyNo: '',
+  contactor: '',
+  mobile: '',
+  addr: '',
+  sendtime: '',
+  supplierNo: '',
+  cat_id: '',
+  goodName: '',
+  goodNum: '',
+  goodPrice: '',
+  sale_total: '',
+  goodUnit: '',
+  tax: ''
+}
+
+export default {
+  name: 'Terrace',
+  mixins: [resToken, companyHelper],
+  props: ['showModel', 'id', 'sitem'],
+  data() {
+    const validatemobile = (rule, value, callback) => {
+      if (value !== '') {
+        if (isPhone(value) || isMobile(value)) {
+          callback()
+        } else {
+          callback(new Error('联系电话格式不正确!'))
+        }
+      } else {
+        callback(new Error('请输入联系电话!'))
+      }
+    }
+
+    return {
+      loading: false,
+      detailLoading: false,
+      title: '添加销售订单信息',
+      khName: '',
+      accounts: [],
+      cat_id_name: '',
+      showModelThis: this.showModel,
+      pickerOptions: {
+        disabledDate: (time) => time.getTime() > new Date()
+      },
+      names: [],
+      unit_name: '',
+      companyName: '',
+      ruleForm: { ...defaultData },
+      rulesThis: this.rules,
+      rules: {
+        goodUnit: [
+          {
+            required: true,
+            message: '请选择单位',
+            trigger: 'blur'
+          }
+        ],
+        // addr_code: [
+        //   {
+        //     type: "array",
+        //     required: true,
+        //     message: "请选择收货省市区",
+        //     trigger: "blur",
+        //   },
+        // ],
+        platform_id: [
+          {
+            required: true,
+            message: '请输入所属平台',
+            trigger: 'blur'
+          }
+        ],
+
+        cgd_tax: [
+          {
+            required: true,
+            message: '请输入采购毛利率',
+            trigger: 'blur'
+          }
+        ],
+        cat_id: [
+          {
+            required: true,
+            message: '请选择商品分类',
+            trigger: 'change'
+          }
+        ],
+        supplierNo: [
+          {
+            type: 'array',
+            required: true,
+            message: '请选择供应商公司',
+            trigger: 'change'
+          }
+        ],
+        qrdType: [
+          {
+            required: true,
+            message: '请输入订单来源',
+            trigger: 'blur'
+          }
+        ],
+        sale_total: [
+          {
+            required: true,
+            message: '请输入货款总金额',
+            trigger: 'blur'
+          }
+        ],
+        // workCode: [
+        //   {
+        //     required: true,
+        //     message: '请输入单据号',
+        //     trigger: 'blur'
+        //   }
+        // ],
+        poCode: [
+          {
+            required: true,
+            message: '请输入PO编号',
+            trigger: 'blur'
+          }
+        ],
+        khNo: [
+          {
+            type: 'array',
+            required: true,
+            message: '请选择购买方公司',
+            trigger: 'change'
+          }
+        ],
+        tax: [
+          {
+            required: true,
+            message: '请选择税率',
+            trigger: 'change'
+          }
+        ],
+        companyNo: [
+          {
+            required: true,
+            message: '请选择销售方公司',
+            trigger: 'change'
+          }
+        ],
+        contactor: [
+          {
+            required: true,
+            message: '请输入收货人',
+            trigger: 'blur'
+          }
+        ],
+        mobile: [
+          {
+            required: true,
+            validator: validatemobile,
+            trigger: 'blur'
+          }
+        ],
+        addr: [
+          {
+            required: true,
+            message: '请输入联系地址',
+            trigger: 'blur'
+          }
+        ],
+
+        sendtime: [
+          {
+            required: true,
+            message: '请输入发货时间',
+            trigger: 'change'
+          }
+        ],
+
+        goodName: [
+          {
+            required: true,
+            message: '请输入商品名称',
+            trigger: 'blur'
+          }
+        ],
+        goodPrice: [
+          {
+            required: true,
+            message: '请输入销售单价',
+            trigger: 'blur'
+          }
+        ],
+        cgdPrice: [
+          {
+            required: true,
+            message: '请选择采购单价',
+            trigger: 'blur'
+          }
+        ],
+        goodNum: [
+          {
+            required: true,
+            message: '请输入数量',
+            trigger: 'blur'
+          }
+        ],
+        cgd_total: [
+          {
+            required: true,
+            message: '请输入采购总额',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  computed: {
+    totalWatchSource() {
+      const { goodNum, goodPrice } = this.ruleForm
+      return { goodNum, goodPrice }
+    },
+    cgdTotalWatchSource() {
+      const { goodNum, cgdPrice } = this.ruleForm
+      return { goodNum, cgdPrice }
+    }
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val
+      if (val) {
+        this.initForm()
+      }
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$emit('cancel')
+      }
+    }
+    // totalWatchSource: {
+    //   handler({ goodPrice, goodNum }) {
+    //     if (goodPrice === 0 || goodNum === 0) {
+    //       this.ruleForm.sale_total = 0
+    //       return
+    //     }
+
+    //     this.ruleForm.sale_total = accMul(goodPrice, goodNum)
+    //   },
+    //   deep: true
+    // },
+    // cgdTotalWatchSource: {
+    //   handler({ cgdPrice, goodNum }) {
+    //     if (cgdPrice === 0 || goodNum === 0) {
+    //       this.ruleForm.cgd_total = 0
+    //       return
+    //     }
+
+    //     this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
+    //   },
+    //   deep: true
+    // }
+  },
+  methods: {
+    async handleHandoverName(e) {
+      this.ruleForm.buyerid = e && e.id ? [e.id] : ''
+      this.ruleForm.buyer_name = e && e.label ? e.label : ''
+      this.$refs.ruleForm.validateField('buyerid')
+    },
+    async select_area_change(e) {
+      this.ruleForm.addr_code = e
+      this.$refs.ruleForm.validateField('addr_code')
+    },
+    number_change(e, type) {
+      this.ruleForm[type] = e
+    },
+    handleClose() {
+      this.showModelThis = false
+      this.companyName = ''
+      this.khName = ''
+      this.supplierName = ''
+      this.ruleForm = { ...defaultData }
+    },
+    async initForm() {
+      this.loading = true
+      // await this.getAccounts();
+
+      if (this.id === '003') {
+        this.title = '添加销售订单信息'
+        this.rulesThis = this.rules
+      } else if (this.id === '005') {
+        this.title = '修改销售订单信息'
+        this.rulesThis = this.rules
+      } else {
+        this.title = '销售订单信息详情'
+        this.rulesThis = {}
+      }
+      await this.resetForm()
+      this.loading = false
+    },
+
+    handleCompanyChange(e) {
+      this.ruleForm.companyNo = e.code || ''
+      this.$refs.ruleForm.validateField('companyNo')
+    },
+    handleCustomerChange(e) {
+      this.ruleForm.khNo = e.code ? [e.code] : ''
+      this.$refs.ruleForm.validateField('khNo')
+    },
+    handleSupplierChange(e) {
+      this.ruleForm.supplierNo = e.code ? [e.code] : ''
+      this.$refs.ruleForm.validateField('supplierNo')
+    },
+    handleGoodClassChange(e) {
+      this.ruleForm.cat_id = e
+      this.$refs.ruleForm.validateField('cat_id')
+    },
+    handleTaxChange(e) {
+      this.ruleForm.tax = e
+      this.$refs.ruleForm.validateField('tax')
+    },
+    unitsearchChange(e) {
+      const { id, code, label } = e
+      this.ruleForm.goodUnit = code ? [code] : []
+      this.$refs.ruleForm.validateField('goodUnit')
+    },
+    async resetForm() {
+      // 重置
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+        }
+      })
+
+      if (this.id === '003') {
+        this.ruleForm.companyNo = this.currentCompany
+        return
+      }
+
+      if (this.id !== '003') this.getDetail()
+    },
+    number_change_total(current, prop) {
+      // const isCgdTotal = prop === 'cgd_total'
+      // const { goodNum } = this.ruleForm
+      // this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
+      this.ruleForm[prop] = current
+
+      // let tax = 0
+      // tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
+      // this.ruleForm.cgd_tax = tax
+      // if (this.ruleForm.cgd_total && this.ruleForm.sale_total) {
+      //   this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total), 100) || 0
+      // }
+    },
+    async getDetail() {
+      this.detailLoading = true
+      const { orderCode } = this.sitem
+      const { data } = await asyncRequest.detail({ orderCode })
+
+      const {
+        cat_id,
+        buyerid,
+        khNo,
+        supplierNo,
+        supplierNanme,
+        khName,
+        goodUnit,
+        tax,
+        addr_code,
+        unitName,
+        ...rest
+      } = data
+
+      this.ruleForm = {
+        ...rest,
+        buyerid: buyerid ? [buyerid] : [],
+        addr_code: addr_code ? addr_code.split(',') : [],
+        cat_id: cat_id ? [cat_id[cat_id.length - 1]] : [],
+        supplierNo: supplierNo ? [supplierNo] : [],
+        khNo: khNo ? [khNo] : [],
+        tax: tax ? tax + '%' : '',
+        goodUnit: goodUnit ? [goodUnit] : ''
+      }
+
+      this.cat_id_name = cat_id.map(({ name }) => name).join('_')
+      this.unit_name = unitName
+
+      this.khName = khName
+      this.supplierName = supplierNanme
+      this.detailLoading = false
+    },
+    platform_codesearchChange(e) {
+      const { id, label, pay_name } = e
+      this.ruleForm.platform_id = id || ''
+      this.pay_name = pay_name || ''
+      this.$refs.ruleForm.validateField('platform_id')
+    },
+    // async getAccounts() {
+    //   const res = await asyncRequest.accountall(this.dataForm);
+    //   if (res && res.code === 0 && res.data) {
+    //     this.accounts = res.data;
+    //   } else if (res && res.code >= 100 && res.code <= 104) {
+    //     await this.logout();
+    //   } else {
+    //     this.$message.warning(res.message);
+    //   }
+    // },
+    async goods_class_change(e) {
+      const { id } = e
+      this.ruleForm.cat_id = id ? [id] : []
+      this.$refs.ruleForm.validateField('cat_id')
+    },
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async(valid) => {
+        if (valid) {
+          if (this.loading) {
+            return
+          }
+
+          this.loading = true
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          model.supplierNo = model.supplierNo[0]
+          model.khNo = model.khNo[0]
+          model.buyerid = Array.isArray(model.buyerid) ? model.buyerid[0] : model.buyerid
+          model.cat_id = model.cat_id ? model.cat_id[model.cat_id.length - 1] : ''
+          model.addr_code = model.addr_code.join(',')
+          model.tax = model.tax.split('%')[0]
+          model.pay_name = this.pay_name
+          model.goodUnit = Array.isArray(model.goodUnit)
+            ? model.goodUnit[0]
+            : model.goodUnit
+
+          let res = {}
+          if (this.id === '003') {
+            delete model['id']
+            res = await asyncRequest.add(model)
+          } else {
+            res = await asyncRequest.update(model)
+          }
+          this.loading = false
+          if (res && res.code === 0) {
+            const title = this.id === '003' ? '添加成功!' : '修改成功!'
+            this.$notify.success({
+              title,
+              message: ''
+            })
+            this.showModelThis = false
+            // 刷新
+            this.$emit('refresh')
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout()
+          } else {
+            this.$message.warning(res.message)
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.terrace {
+}
+</style>

+ 14 - 1
src/views/netOrderEntry/netOrderEnter/index.vue

@@ -210,6 +210,14 @@
       @refresh="searchList"
       @cancel="showModel = false"
     />
+
+    <detail-modal
+      :id="modelId"
+      :show-model="showModelDetail"
+      :sitem="sitem"
+      @refresh="searchList"
+      @cancel="showModelDetail = false"
+    />
   </div>
 </template>
 <script>
@@ -224,6 +232,7 @@ import addEdit from "./addEdit";
 import companyHelper from "@/mixins/companyHelper";
 import { utils, writeFile } from "xlsx";
 import importTemplateModal from "./importTemplateModal.vue";
+import DetailModal from "./detail-modal.vue"
 import { template } from "./template";
 
 export default {
@@ -232,6 +241,7 @@ export default {
   components: {
     addEdit,
     importTemplateModal,
+    DetailModal
   },
   computed: {
     //组件SIZE设置
@@ -262,6 +272,7 @@ export default {
       sitem: {},
       customerName: "",
       mapSelectValue2Query,
+      showModelDetail:false,
       value: "",
       parmValue: {
         page: 1, // 页码
@@ -428,6 +439,8 @@ export default {
         this.$message.warning("请选择一家业务公司");
         return;
       }
+
+
       // const { status } = row;
       // if (type === "005" && status === "1") {
       //   this.$message.warning("禁用后,才可以修改!");
@@ -436,7 +449,7 @@ export default {
 
       this.sitem = row;
       this.modelId = type;
-      this.showModel = true;
+      this[type === '007' ? 'showModelDetail' : 'showModel'] = true;
     },
     // 时间
     async handleTime(e) {

+ 32 - 52
src/views/netOrderEntry/prestoreRecordingOrders/addEdit.vue

@@ -288,7 +288,7 @@
                     :size="'mini'"
                     :controls="false"
                     :append="'%'"
-                    @reschange="number_change($event, 2)"
+                    @reschange="number_change($event, 'cgd_tax')"
                   />
                 </el-form-item>
               </el-col>
@@ -319,7 +319,7 @@
                     :precision="2"
                     :min="0"
                     :step="0.01"
-                    @change="number_change($event, 1)"
+                    @change="number_change($event, 'goodPrice')"
                   />
                 </el-form-item>
               </el-col>
@@ -334,7 +334,7 @@
                     :precision="2"
                     :min="0"
                     :step="0.01"
-                    @change="number_change($event, 1)"
+                    @change="number_change($event, 'cgdPrice')"
                   />
                 </el-form-item>
               </el-col>
@@ -618,29 +618,29 @@ export default {
       if (!val) {
         this.$emit('cancel')
       }
-    },
-    totalWatchSource: {
-      handler({ goodPrice, goodNum }) {
-        if (goodPrice === 0 || goodNum === 0) {
-          this.ruleForm.sale_total = 0
-          return
-        }
-
-        this.ruleForm.sale_total = accMul(goodPrice, goodNum)
-      },
-      deep: true
-    },
-    cgdTotalWatchSource: {
-      handler({ cgdPrice, goodNum }) {
-        if (cgdPrice === 0 || goodNum === 0) {
-          this.ruleForm.cgd_total = 0
-          return
-        }
-
-        this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
-      },
-      deep: true
     }
+    // totalWatchSource: {
+    //   handler({ goodPrice, goodNum }) {
+    //     if (goodPrice === 0 || goodNum === 0) {
+    //       this.ruleForm.sale_total = 0
+    //       return
+    //     }
+
+    //     this.ruleForm.sale_total = accMul(goodPrice, goodNum)
+    //   },
+    //   deep: true
+    // },
+    // cgdTotalWatchSource: {
+    //   handler({ cgdPrice, goodNum }) {
+    //     if (cgdPrice === 0 || goodNum === 0) {
+    //       this.ruleForm.cgd_total = 0
+    //       return
+    //     }
+
+    //     this.ruleForm.cgd_total = accMul(cgdPrice, goodNum)
+    //   },
+    //   deep: true
+    // }
   },
   methods: {
     async handleHandoverName(e) {
@@ -653,27 +653,7 @@ export default {
       this.$refs.ruleForm.validateField('addr_code')
     },
     number_change(e, type) {
-      this.ruleForm.cgd_tax = e
-      const { cgdPrice, goodPrice, cgd_tax } = this.ruleForm
-      let tax = 0
-      let cgd_price = 0
-
-      if (type === 1) {
-        // tax = (1 - cgdPrice / goodPrice)*100
-        tax = accMul(accSub(1, accDiv(cgdPrice, goodPrice)), 100)
-        this.ruleForm.cgd_tax = tax
-        this.$refs.ruleForm.validateField('cgd_tax')
-      }
-      if (type === 2) {
-        // cgd_price = ((100 - cgd_tax) / 100) * goodPrice;
-        cgd_price = accMul(accDiv(accSub(100, cgd_tax), 100), goodPrice) || 0
-        this.ruleForm.cgdPrice = cgd_price
-        this.$refs.ruleForm.validateField('cgdPrice')
-      }
-
-      // if (this.ruleForm.cgdPrice && this.ruleForm.goodPrice) {
-      //   this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgdPrice, this.ruleForm.goodPrice), 100) || 0
-      // }
+      this.ruleForm[type] = e
     },
     handleClose() {
       this.showModelThis = false
@@ -742,14 +722,14 @@ export default {
       if (this.id !== '003') this.getDetail()
     },
     number_change_total(current, prop) {
-      const isCgdTotal = prop === 'cgd_total'
-      const { goodNum } = this.ruleForm
-      this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
+      // const isCgdTotal = prop === 'cgd_total'
+      // const { goodNum } = this.ruleForm
+      // this.ruleForm[isCgdTotal ? 'cgdPrice' : 'goodPrice'] = accDiv(current, goodNum)
       this.ruleForm[prop] = current
 
-      let tax = 0
-      tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
-      this.ruleForm.cgd_tax = tax
+      // let tax = 0
+      // tax = accMul(accSub(1, accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total)), 100)
+      // this.ruleForm.cgd_tax = tax
       // if (this.ruleForm.cgd_total && this.ruleForm.sale_total) {
       //   this.ruleForm['cgd_tax'] = accMul(accDiv(this.ruleForm.cgd_total, this.ruleForm.sale_total), 100) || 0
       // }

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels