build

src/apis/service/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/index.js

@@ -0,0 +1,10 @@
+// 物业管理员
+import http from '@/apis/axios'
+const api = 'admin/'
+export default {
+  // 分页查询
+  list: (data, params) => http(api + 'child_list', data, 'post', params),
+  detail: (data, params) => http(api + 'child_info', data, 'post', params),
+  express: (data, params) => http(api + 'child_send', data, 'post', params),
+  supplement: (data, params) => http(api + 'child_out_make', data, 'post', params)
+}

src/components/globalComponents/company-sort/index.vue

@@ -1,29 +1,32 @@
 <template>
-  <el-select
-    v-model="value"
-    multiple
-    filterable
-    remote
-    clearable
-    collapse-tags
-    :multiple-limit="1"
-    reserve-keyword
-    :size="size || 'medium'"
-    style="width: 100%"
-    :placeholder="placeholder || ''"
-    :disabled="disabled"
-    :remote-method="remoteMethod"
-    :loading="selectLoading"
-    @change="selectChange"
-  >
-    <el-option
-      v-for="(item, index) in options"
-      :key="item.id + index"
-      :label="item.cat_name"
-      :value="item.cat_id + ''"
-      :disabled="item.status + '' !== '1'"
-    />
-  </el-select>
+
+  <div>
+    <el-select
+      v-model="value"
+      multiple
+      filterable
+      remote
+      clearable
+      collapse-tags
+      :multiple-limit="1"
+      reserve-keyword
+      :size="size || 'medium'"
+      style="width: 100%"
+      :placeholder="placeholder || ''"
+      :disabled="disabled"
+      :remote-method="remoteMethod"
+      :loading="selectLoading"
+      @change="selectChange"
+    >
+      <el-option
+        v-for="(item, index) in options"
+        :key="item.id + index"
+        :label="item.cat_name"
+        :value="item.cat_id + ''"
+        :disabled="item.status + '' !== '1'"
+      />
+    </el-select>
+  </div>
 </template>
 
 <script>
@@ -56,22 +59,27 @@ export default {
     }
   },
   watch: {
-    names: function(val, old) {
-      // console.log(val, old, this.isDetail, "1");
-      this.searchName = val
-      if (this.isDetail && this.searchName) {
-        this.remoteMethod(this.searchName)
-      }
+    names: {
+      handler(val, old) {
+        this.searchName = val
+        if (this.isDetail && this.searchName) {
+          this.remoteMethod(this.searchName)
+        }
+      },
+      immediate: true,
+      deep: true
     },
-    isDetail: function(val, old) {
-      // console.log(val, old, this.isDetail, "2");
-      if (val && this.searchName) {
-        this.remoteMethod(this.searchName)
+    isDetail: {
+      handler(val, old) {
+        if (val && this.searchName) {
+          this.remoteMethod(this.searchName)
+        }
       }
+      // immediate: true,
+      // deep: true
     },
     companyNo: function(val) {
-      console.log(val)
-      if (!val) return
+      if (!val || (this.isDetail || this.names)) return
       this.remoteMethod()
     }
   },

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/columns.js

@@ -0,0 +1,277 @@
+export default [
+
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    width: '160'
+  },
+  {
+    prop: 'outCode',
+    label: '发货单编号',
+    width: '160'
+  },
+  {
+    prop: 'orderCode',
+    label: '销售订单编号',
+    width: '160'
+  },
+  {
+    prop: 'cgdNo',
+    label: '采购单编号',
+    width: '160'
+  },
+  {
+    prop: 'good_name',
+    label: '产品名称',
+    width: '160'
+  },
+  {
+    prop: 'has_account',
+    label: '供应商端',
+    width: '80',
+    _slot_: 'has_account'
+  },
+  {
+    prop: 'use_type',
+    label: '平台类型',
+    _slot_: 'use_type',
+    width: '70'
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    width: '85px'
+  },
+  {
+    prop: 'order_type',
+    label: '商品类型',
+    _slot_: 'order_type',
+    width: '100'
+  },
+  {
+    prop: 'order_source',
+    label: '订单来源',
+    _slot_: 'order_source',
+    width: '100'
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    width: '100'
+  },
+  {
+    prop: 'wsm_code',
+    label: '仓库编号',
+    width: '155'
+  },
+  {
+    prop: 'wsm_name',
+    label: '仓库名称',
+    width: '160'
+  },
+  {
+    prop: 'sendtime',
+    label: '发货时间',
+    width: '160'
+  },
+  {
+    prop: 'spuCode',
+    label: '商品成本编码',
+    width: '160'
+  },
+  {
+    prop: 'skuCode',
+    label: '商品上线编码',
+    width: '160'
+  },
+  {
+    prop: 'companyNo',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_code',
+    label: '客户编号',
+    width: '160'
+  },
+  {
+    prop: 'customer_name',
+    label: '客户名称',
+    width: '160'
+  },
+  {
+    prop: 'supplierNo',
+    label: '供应商编号 ',
+    width: '160'
+  },
+  {
+    prop: 'supplierName',
+    label: '供应商名称',
+    width: '160'
+  },
+  // {
+  //   prop: 'send_status',
+  //   label: '分单状态',
+  //   _slot_: 'send_status',
+  //   width: '120px'
+  // },
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80'
+  },
+  {
+    prop: 'addtime',
+    label: '下单时间',
+    width: 150
+  }
+]
+// page	是	string	页码
+// size	是	string	页码数
+// cgdNo	是	string	采购单编号
+// returnCode	是	string	退货单编号
+// good_type_code	是	string	商品属性
+// good_name	是	string	商品名称
+// status	是	string	状态
+export const sendOutOrderColumns = [
+  {
+    type: 'index',
+    label: '序号',
+    width: '70px'
+  },
+  {
+    prop: 'value0',
+    label: '发货工单号',
+    'min-width': '156px'
+  },
+  {
+    prop: 'value1',
+    label: '发货单编号',
+    'min-width': '156px'
+  },
+  {
+    prop: 'value2',
+    label: '销售订单编号',
+    'min-width': '156px'
+  },
+  // {
+  //   prop: 'value3',
+  //   label: '订单编号',
+  //   'min-width': '156px'
+  // },
+  // {
+  //   prop: 'value11',
+  //   label: '',
+  //   'min-width': '180px'
+  // },
+  {
+    prop: 'value7',
+    label: '总数量',
+    'min-width': '100px'
+  },
+  // {
+  //   prop: 'value8',
+  //   label: '仓库编号',
+  //   'min-width': '100px'
+  // },
+  // {
+  //   prop: 'value9',
+  //   label: '仓库名称',
+  //   'min-width': '100px'
+  // },
+  // {
+  //   prop: 'value10',
+  //   label: '商品成本编码',
+  //   'min-width': '100px'
+  // },
+  // {
+  //   prop: 'value11',
+  //   label: '商品上线编码',
+  //   'min-width': '100px'
+  // },
+  // {
+  //   prop: 'value12',
+  //   label: '商品名称',
+  //   'min-width': '100px'
+  // },
+  {
+    prop: 'value22',
+    label: '物流公司',
+    'min-width': '150px'
+  },
+  {
+    prop: 'value23',
+    label: '物流单号',
+    'min-width': '150px'
+  },
+  {
+    prop: 'value24',
+    label: '物流费用',
+    'min-width': '140px'
+  }
+  // {
+  //   prop: 'value25',
+  //   label: '收货地址',
+  //   'min-width': '140px'
+  // },
+  // {
+  //   prop: 'value26',
+  //   label: '收货人',
+  //   'min-width': '140px'
+  // },
+  // {
+  //   prop: 'value27',
+  //   label: '收货联系人',
+  //   'min-width': '140px'
+  // },
+  // {
+  //   prop: 'value28',
+  //   label: '联系方式',
+  //   'min-width': '140px'
+  // },
+  // {
+  //   prop: 'value29',
+  //   label: '采购单号',
+  //   'min-width': '140px'
+  // }
+]
+export const head = [
+  '发货工单号',
+  '发货单编号	',
+  '销售订单编号	',
+  '供应商端	',
+  '状态	',
+  '商品类型	',
+  '订单来源	',
+  '总数量	',
+  '仓库编号	',
+  '仓库名称	',
+  '商品成本编码	',
+  '商品上线编码	',
+  '商品名称	',
+  '业务公司编号	',
+  '业务公司名称	',
+  '客户编号	',
+  '客户名称	',
+  '供应商编号	',
+  '供应商名称	',
+  '下单时间	',
+  '申请人	',
+  '对接类型	',
+  '物流公司	',
+  '物流单号	',
+  '物流费用',
+  '收货地址',
+  '收货联系人',
+  '联系方式',
+  '采购单号',
+  '备注'
+]
+
+console.log(head.length)

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/components/ShowDataTableColumns.js

@@ -0,0 +1,86 @@
+
+const showColumns = [
+  {
+    prop: 'outChildCode',
+    label: '发货工单号',
+    span: 7
+  },
+  {
+    prop: 'status',
+    label: '状态',
+    _slot_: 'status',
+    span: 5
+  },
+  {
+    prop: 'order_type',
+    label: '订单来源',
+    _slot_: 'order_type',
+    span: 6
+  }, {
+    prop: 'apply_name',
+    label: '创建人',
+    span: 6
+  },
+
+  {
+    prop: 'supplierName',
+    label: '供应商公司',
+    _slot_: 'supplierName',
+    span: 12
+  },
+  {
+    prop: 'companyName',
+    label: '业务公司',
+    _slot_: 'companyName',
+    span: 12
+  },
+  {
+    prop: 'customer_code',
+    label: '客户公司',
+    _slot_: 'customer',
+    span: 12
+  },
+  {
+    prop: 'wsm_code',
+    label: '仓库名称',
+    _slot_: 'wsm_code',
+    span: 12
+  },
+  {
+    prop: 'num',
+    label: '总数量',
+    span: 6
+  },
+  {
+    prop: 'addtime',
+    label: '创建时间',
+    span: 6
+  },
+  {
+    prop: 'sendtime',
+    label: '发货时间',
+    span: 6
+  },
+  {
+    prop: 'post_name',
+    label: '物流公司',
+    span: 6
+  },
+  {
+    prop: 'post_code',
+    label: '物流编号',
+    span: 12
+  },
+  {
+    prop: 'post_fee',
+    label: '物流费用',
+    span: 12
+  },
+  {
+    prop: 'remark',
+    label: '备注',
+    span: 24
+  }
+]
+
+export { showColumns }

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/components/addEdit.vue

@@ -0,0 +1,131 @@
+<template>
+  <el-dialog
+    v-loading="loading || detailLoading"
+    :title="title"
+    :center="true"
+    align="left"
+    top="10vh"
+    width="500px"
+    :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="rules"
+            size="mini"
+          >
+            <el-form-item label="发货单编号:" prop="outCode">
+              <el-input v-model="ruleForm.outCode" placeholder="发货单编号" />
+            </el-form-item>
+          </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/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement'
+import companyHelper from '@/mixins/companyHelper'
+import resToken from '@/mixins/resToken'
+
+const defaultData = { outCode: '' }
+
+export default {
+  name: 'Terrace',
+  mixins: [resToken, companyHelper],
+  props: ['showModel', 'id', 'sitem'],
+  data() {
+    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 },
+      rules: {
+        outCode: [
+          {
+            required: true,
+            message: '请输入发货单编号',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
+  },
+  watch: {
+    showModel: function(val) {
+      this.showModelThis = val
+    },
+    showModelThis(val) {
+      if (!val) {
+        this.$refs.ruleForm.resetFields()
+        this.$emit('cancel')
+      }
+    }
+  },
+  methods: {
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async(valid) => {
+        if (valid) {
+          if (this.loading) {
+            return
+          }
+
+          const res = await asyncRequest.supplement(this.ruleForm)
+          this.loading = false
+          if (res && res.code === 0) {
+            const title = '添加成功'
+            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>

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/components/express.vue

@@ -0,0 +1,281 @@
+<template>
+  <el-form
+    ref="ruleForm"
+    v-loading="loading"
+    :model="ruleForm"
+    :rules="rules"
+    :size="'mini'"
+    status-icon
+    label-width="95px"
+    class="demo-ruleForm"
+  >
+    <el-row>
+      <el-col :span="18">
+        <el-form-item label="物流费用" prop="post_fee">
+          <digital-input
+            :values="ruleForm.post_fee"
+            :placeholder="'物流费用'"
+            :min="0"
+            :disabled="type === 'view' || type === 'post_fee'"
+            :max="100000000000"
+            :position="'right'"
+            :precision="2"
+            :size="'mini'"
+            :controls="false"
+            :append="'元'"
+            @reschange="number_change($event, 'post_fee')"
+          />
+        </el-form-item>
+        <el-form-item label="物流公司" prop="post_name">
+          <search-express
+            :value="ruleForm.post_name"
+            :placeholder="'物流公司'"
+            :names="''"
+            :size="'mini'"
+            :order_source="order_source"
+            :is-detail="false"
+            @searchChange="handleCompany"
+          /> </el-form-item>
+        <el-col
+          v-for="(domain, index) in ruleForm.post_code"
+          :key="domain.key"
+          :span="12"
+        >
+          <el-form-item
+            :key="domain.key"
+            :label="'物流单号' + (index + 1)"
+            :prop="'post_code.' + index + '.value'"
+            :rules="const_post"
+          >
+            <el-input
+              v-model="domain.value"
+              placeholder="物流单号"
+              minlength="9"
+              maxlength="20"
+            >
+              <el-button
+                slot="append"
+                icon="el-icon-delete"
+                @click.prevent="removeDomain(index)"
+              />
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" style="text-align: right; padding: 0 0 16px 0">
+          <el-button
+            type="warning"
+            :size="'mini'"
+            icon="el-icon-circle-plus-outline"
+            @click="addDomain"
+          >添加快递单号</el-button>
+          <el-button
+            type="primary"
+            :size="'mini'"
+            icon="el-icon-search"
+            @click="submitForm"
+          >保 存
+          </el-button>
+        </el-col>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+<script>
+import asyncRequest from '@/apis/service/sellOut/deliveryWorkOrder'
+import resToken from '@/mixins/resToken'
+import { isnumber, isNumeric } from '@/utils/validate'
+export default {
+  name: 'WsmInOrderAdd',
+  mixins: [resToken],
+  props: ['id', 'sitem', 'newTime'],
+  data() {
+    const validate_num = (rule, value, callback) => {
+      const { required } = rule
+      if (required && value === '') {
+        callback(new Error('不能为空！'))
+      } else {
+        callback()
+      }
+    }
+    const validateCode = (rule, value, callback) => {
+      const { required } = rule
+      const l = value.length
+      if (required) {
+        if (value === '') {
+          callback(new Error('物流单号不能为空!'))
+        } else if (l < 9 || l > 20) {
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
+        } else if (isnumber(value)) {
+          callback()
+        } else if (!isNumeric(value)) {
+          console.log(!isNumeric(value))
+          callback(new Error('仅支持纯数字或字母数字组合(9~20位)!'))
+        } else {
+          callback()
+        }
+      } else {
+        callback()
+      }
+    }
+
+    return {
+      loading: true,
+      order_source: '',
+      const_post: {
+        required: true,
+        validator: validateCode,
+        trigger: 'blur'
+      },
+      ruleForm: {
+        post_name: [],
+        post_code: [
+          {
+            value: '',
+            key: Date.now()
+          }
+        ],
+        post_fee: ''
+      },
+      rules: {
+        post_name: {
+          type: 'array',
+          required: true,
+          trigger: 'change',
+          message: '请输入物流公司'
+        },
+        post_code: {
+          required: true,
+          validator: validateCode,
+          trigger: 'blur'
+        },
+        post_fee: {
+          required: true,
+          validator: validate_num,
+          trigger: 'blur'
+        }
+      }
+    }
+  },
+  watch: {
+    newTime: function(val) {
+      if (val) {
+        this.initForm()
+      }
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      this.loading = true
+      await this.resetForm()
+      this.loading = false
+    },
+    removeDomain(index) {
+      if (this.ruleForm.post_code.length === 1) {
+        this.$message.warning('至少填写一个快递单号！')
+        return
+      }
+      if (index !== -1) {
+        this.ruleForm.post_code.splice(index, 1)
+      }
+    },
+    addDomain() {
+      if (this.ruleForm.post_code.length >= 10) {
+        this.$message.warning('最多只能添加10条物流单号!')
+        return
+      }
+
+      this.ruleForm.post_code.push({
+        value: '',
+        key: Date.now()
+      })
+    },
+    // 初始化表单
+    async resetForm() {
+      await this.$nextTick(() => {
+        if (this.$refs.ruleForm) {
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+
+          const {
+            post_code,
+            post_name,
+            post_fee,
+            remark,
+            order_source
+          } = this.sitem
+          this.order_source = order_source
+          this.ruleForm = {
+            post_name: post_name ? [post_name] : [],
+            post_code: [
+              {
+                value: post_code || '',
+                key: Date.now()
+              }
+            ],
+            post_fee: post_fee || '',
+            remark: remark || ''
+            // sendtime: "",
+          }
+        }
+      })
+    },
+    // 保存更改
+    async submitForm() {
+      await this.$refs.ruleForm.validate(async(valid) => {
+        if (valid) {
+          if (this.loading) {
+            return
+          }
+          this.loading = true
+          const { post_code, post_name, post_fee } = this.ruleForm
+          const { outChildCode } = this.sitem
+
+          const model = {
+            list: [{
+              post_fee,
+              outChildCode,
+              post_name: Array.isArray(post_name) ? post_name[0] : post_name,
+              post_code: post_code.map(({ value }) => value).join(',')
+            }]
+          }
+
+          const { code, message } = await asyncRequest.express(model)
+          this.loading = false
+          if (code === 0) {
+            this.$notify.success({
+              title: '添加成功',
+              message: ''
+            })
+            this.$emit('refresh')
+          } else if (code >= 100 && code <= 104) {
+            await this.logout()
+          } else {
+            this.$message.warning(message)
+          }
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    handleCompany(e) {
+      const { code, id, label } = e
+      this.ruleForm.post_name = label ? [label] : []
+      this.$refs.ruleForm.validateField('post_name')
+    },
+    number_change(e, key) {
+      this.ruleForm[key] = e + '' || '0'
+      this.$refs.ruleForm.validateField(key)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.account {
+}
+</style>

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/detail.vue

@@ -0,0 +1,230 @@
+<template>
+  <div class="sellReturnDetail pagePadding" > 
+    <div style="width: 100%"  v-if="powers.some((i) => i == '007')">
+      <el-tabs v-model="activeTabs">
+        <el-tab-pane label="业务详情" name="1">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="发货工单详情" name="0">
+              <show-data-table
+                style="margin: 0; padding: 0"
+                :sitem="sitem"
+                v-if="status"
+                :columns="showColumns"
+              >
+                <template slot="status">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (statusOptions.find((item) => item.value == sitem.status) || {})
+                        .label || '--'
+                    "
+                  />
+                </template>
+                <template slot="order_type">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        xs_order_type_options.find(
+                          (item) => item.id == sitem.order_type
+                        ) || {}
+                      ).label || '--'
+                    "
+                  />
+                </template>
+
+                <template slot="supplierName">
+                  <span>{{ sitem.supplierName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>供应商编号:</span><span>{{ sitem.supplierNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+                <template slot="companyName">
+                  <span>{{ sitem.companyName }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>业务公司编号:</span
+                        ><span>{{ sitem.companyNo }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="customer">
+                  <span>{{ sitem.customer_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>客户公司编号:</span
+                        ><span>{{ sitem.customer_code }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+
+                <template slot="wsm_code">
+                  <span>{{ sitem.wsm_name }}</span>
+                  <el-popover placement="top" width="300" trigger="hover">
+                    <ul>
+                      <li>
+                        <span>仓库编号:</span
+                        ><span>{{ sitem.wsm_code }}</span>
+                      </li>
+                      <li>
+                        <span>仓库负责人:</span
+                        ><span>{{ sitem.contactor_name }}</span>
+                      </li>
+                    </ul>
+                    <i class="el-icon-warning-outline fr" slot="reference"></i>
+                  </el-popover>
+                </template>
+              </show-data-table>
+            </el-collapse-item>
+
+            <el-collapse-item title="商品信息" name="2">
+              <show-goods-data-table
+                :newTime="newTime"
+                v-if="newTime !== ''"
+                :type="sitem.order_type"
+                :skucode="sitem.skuCode"
+                :spucode="sitem.spuCode"
+              />
+            </el-collapse-item>
+
+            <!-- canSend -->
+            <el-collapse-item title="待库管发货" name="2"  v-if="canSend && sitem.status === '1' && !isSupertube && ppowers.includes('1')">
+              <express-node @refresh="() => initData()" :sitem="sitem" />
+            </el-collapse-item>
+          </el-collapse>
+        </el-tab-pane>
+
+        <el-tab-pane label="审批记录" name="2">
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'FHGD'"
+            :orderCode="queryId"
+          />
+        </el-tab-pane>
+      </el-tabs>
+    </div>
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import asyncRequest from "@/apis/service/sellOut/deliveryWorkOrder";
+import { showColumns } from "./components/ShowDataTableColumns";
+import { xs_order_type_options } from "@/assets/js/statusList";
+import ExpressNode from "./components/express.vue"
+import { mapGetters } from "vuex";
+export default {
+  name: "deliveryWorkOrderDetail",
+  mixins: [mixinPage, resToken],
+  components: { ExpressNode },
+  data() {
+    return {
+      showColumns,
+      activeTabs: "1",
+      goodDetail:null,
+      statusOptions: [
+        { value: "1", label: "待发货" },
+        { value: "2", label: "发货完成" },
+        // { value: "3", label: "已收货" },
+        // { value: "4", label: "已全部收货" },
+        { value: "5", label: "已取消"}
+      ],
+      xs_order_type_options,
+      sitem: null, //传给组件
+      activeNames: ["0", "1", "2", "3", "4", "5", "6"],
+      status: "", //存储详情接口状态
+      statusList: [
+        {
+          value: "1",
+          label: "待验货",
+        },
+        {
+          value: "2",
+          label: "待验货审核",
+        },
+        {
+          value: "3",
+          label: "待业务审核",
+        },
+      ],
+      newTime: "",
+      loading: false,
+      is_stock: "",
+      queryId: "",
+    };
+  },
+  mounted() {
+    this.queryId = this.$route.query.id;
+    this.initData();
+  },
+  computed:{
+    ...mapGetters(["isSupertube"]),
+    canSend(){
+      const { id:userId } = this.userInfo || {};
+      const { contactor:manangerUserId ,order_type ,has_account } = this.sitem || {};
+      const isStock = String(order_type) === '1'
+
+      /* 不是库存品&&没有供应商端账号 **/
+      if(!isStock && String(has_account) !== '1'){
+        return true
+      }
+
+      /* 库存品&&用户id和库管id一致 **/
+      if(!userId || !manangerUserId) return false
+      return userId === manangerUserId
+    },
+    ...mapGetters(['isSupertube','userInfo']),
+    powers() {
+      const { btnList } = this.$store.getters;
+      const tran = btnList.find((item) => item.menu_route == "deliveryWorkOrderDetail" ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    ppowers() {
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "FHGD") || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    }
+  },
+  methods: {
+    async initData() {
+      const { code, data, message } = await asyncRequest.detail({
+        outChildCode: this.queryId,
+      });
+      if (code === 0) {
+        const { is_stock, status } = data;
+        this.is_stock = is_stock;
+        this.status = status;
+        this.sitem = data;
+        // this.queryId = this.s
+        this.getNewTime();
+      } else if (code >= 100 && code <= 104) {
+        await this.logout();
+      } else {
+        this.$message.warning(message);
+      }
+    },
+    getNewTime() {
+      this.newTime = new Date().valueOf();
+    },
+  },
+};
+</script>
+

src/views/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement/index.vue

@@ -0,0 +1,637 @@
+<template>
+  <div class="sellReturn pagePadding">
+    <div v-if="powers.some((i) => i == '001')">
+      <ex-table
+        v-loading="loading"
+        :table="table"
+        :data="tableData"
+        :columns="columns"
+        :page="pageInfo"
+        :size="size"
+        @page-curr-change="handlePageChange"
+        @page-size-change="handleSizeChange"
+        @selection="handleSelection"
+        @screen-reset="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+        @screen-submit="
+          pageInfo.curr = 1;
+          parmValue.page = 1;
+          searchList();
+        "
+      >
+        <template #table-header="{}">
+          <div style="width: 100%">
+            <el-row style="padding: 0 0 0 80px">
+              <el-col :span="4" style="width: 120px">
+                <el-switch 
+                  v-model="parmValue.use_type"
+                  :active-value="usetypeOtions[1].value"
+                  :inactive-value="usetypeOtions[0].value"
+                  :active-text="usetypeOtions[1].label"
+                  :inactive-text="usetypeOtions[0].label"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                />
+              </el-col>
+              <!-- 时间区间 -->
+              <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
+                <period-date-picker
+                  :type="1"
+                  :width="'135px'"
+                  :size="searchSize"
+                  :start="parmValue.start"
+                  :end="parmValue.end"
+                  @timeReturned="handleTime"
+                />
+              </el-col>
+              <el-col :span="3" style="width: 240px; padding: 0 0 0 10px">
+                <search-customer
+                  :value="parmValue.customer_code"
+                  :size="'mini'"
+                  style="width: 100%"
+                  :names="parmValue.customerName"
+                  :placeholder="'企业客户'"
+                  :disabled="false"
+                  :is-detail="true"
+                  @searchChange="customer_code_change"
+                />
+              </el-col>
+
+              <el-col :span="3" style="width: 66px; float: right">
+                <el-button
+                  :size="searchSize"
+                  type="primary"
+                  style="float: right; margin-left: 5px"
+                  @click="searchList"
+                >
+                  刷新
+                </el-button>
+              </el-col>
+            </el-row>
+
+            <el-row style="margin-top: 10px">
+              <el-col :span="3" style="width: 200px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.status"
+                  filterable
+                  clearable
+                  placeholder="状态"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 151px; padding: 0 0 0 10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_source"
+                  filterable
+                  clearable
+                  placeholder="订单来源"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_source_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 151px; padding: 0 0 0 10px">
+                <el-select
+                  :size="searchSize"
+                  v-model="parmValue.order_type"
+                  filterable
+                  clearable
+                  placeholder="商品类型"
+                  style="width: 100%"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in xs_order_type_options"
+                    :key="'orderstatus' + item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-col>
+
+              <el-col :span="4" style="width: 240px; padding: 0 0 0 10px">
+                <search-supplier
+                  :size="'mini'"
+                  style="width: 100%"
+                  :value="parmValue.supplierNo"
+                  :names="parmValue.supplierName"
+                  :disabled="false"
+                  :placeholder="'供应商名称'"
+                  :isDetail="true"
+                  :noDisabled="true"
+                  @searchChange="supplierChange"
+                />
+              </el-col>
+              <el-col :span="4" class="fr" style="width: 66px; padding: 0 0 0 10px">
+                <el-button
+                  type="warning"
+                  class="fr"
+                  :size="searchSize"
+                  @click="restSearch"
+                >
+                  重置
+                </el-button>
+              </el-col>
+
+            <el-col
+              :span="3"
+              class="fr"
+              style="width: 66px; padding: 0 0 0 10px"
+            >
+              <el-button type="success" :size="searchSize" @click="openModal()"
+                >添加</el-button
+              >
+            </el-col>
+            </el-row>
+
+            <el-row style="padding: 10px 0 0 0">              
+              <el-col :span="6" style="width: 502px;margin-left: 0px;">
+                <el-input
+                  clearable
+                  placeholder="关键字"
+                  v-model="s_input"
+                  maxlength="40"
+                  :size="searchSize"
+                  class="input-with-select"
+                >
+                  <el-select
+                    v-model="select"
+                    style="width: 150px"
+                    slot="prepend"
+                    placeholder="关键字类型"
+                  >
+                    <el-option label="销售订单编号" value="orderCode" />
+                    <el-option label="采购单编号" value="cgdNo" />
+                    <el-option label="发货工单编号" value="outChildCode" />
+                    <el-option label="商品成本编号" value="spuCode" />
+                    <el-option label="发货单编号" value="outCode" />
+                    <el-option label="商品上线编号" value="skuCode" />
+                    <el-option label="申请人" value="apply_name" />
+                  </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    "
+                  ></el-button>
+                </el-input>
+              </el-col>
+              
+              <!-- <el-col :span="5">
+                <el-select size="mini" style="width:104%;margin-left: 10px;" placeholder=""  v-model="parmValue.IsByMe" @change="
+                      pageInfo.curr = 1;
+                      parmValue.page = 1;
+                      searchList();
+                    ">
+                  <el-option label="与我相关" value="0" />
+                  <el-option label="由我执行" value="1" />
+                </el-select>
+              </el-col> -->
+            </el-row>
+          </div>
+        </template>
+        <template #status="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="scope.row.status == '0' ? 'warning' : ''"
+            v-text="
+              (statusOptions.find((item) => item.value == scope.row.status) || {})
+                .label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #use_type="{ scope }">
+          <el-tag size="mini">
+            {{
+              (usetypeOtions.find(({ value }) => value === scope.row.use_type) || {})
+                .label || "---"
+            }}
+          </el-tag>
+        </template>
+
+        <template #has_account="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            :type="
+              (
+                has_account_list.find(
+                  (item) => item.code == scope.row.has_account + ''
+                ) || {}
+              ).type || '--'
+            "
+            v-text="
+              (
+                has_account_list.find(
+                  (item) => item.code == scope.row.has_account + ''
+                ) || {}
+              ).name || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #order_type="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_type_options.find((item) => item.id == scope.row.order_type) ||
+                {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #order_source="{ scope }">
+          <el-tag
+            :size="tablebtnSize"
+            v-text="
+              (
+                xs_order_source_options.find(
+                  (item) => item.id == scope.row.order_source
+                ) || {}
+              ).label || '--'
+            "
+          ></el-tag>
+        </template>
+
+        <template #operation="{ scope }">
+          <el-tooltip
+            v-if="powers.some((i) => i == '007')"
+            effect="dark"
+            content="详情"
+            placement="top"
+          >
+            <i
+              class="el-icon-view tb-icon"
+              @click="getRouter('deliveryWorkOrderDetail', scope.row.outChildCode)"
+            ></i>
+          </el-tooltip>
+        </template>
+      </ex-table>
+    </div>
+    
+    <div v-else>
+      <no-auth></no-auth>
+    </div>
+
+    <add-edit
+      :show-model="showModel"
+      @refresh="searchList"
+      @cancel="showModel = false"
+    />
+  </div>
+</template>
+<script>
+import mixinPage from "@/mixins/elPaginationHandle";
+import resToken from "@/mixins/resToken";
+import columns from "./columns";
+import asyncRequest from "@/apis/service/deliveryWorkOrderSupplement/deliveryWorkOrderSupplement";
+import { mapGetters } from "vuex";
+import urlConfig from "@/apis/url-config";
+import {
+  xs_order_type_options,
+  xs_order_source_options,
+  has_account_list,
+  usetypeOtions,
+} from "@/assets/js/statusList";
+import companyHelper from "@/mixins/companyHelper";
+import addEdit from "./components/addEdit.vue";
+
+export default {
+  name: "sellReturn",
+  mixins: [mixinPage, resToken, companyHelper],
+  components:{ addEdit },
+  computed: {
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
+    powers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "deliveryWorkOrder"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+    dpowers() {
+      const tran =
+        this.$store.getters.btnList.find(
+          (item) => item.menu_route == "deliveryWorkOrderDetail"
+        ) || {};
+      const { action } = tran ?? {};
+      return action ?? [];
+    },
+  },
+  data() {
+    return {
+      xs_order_type_options,
+      xs_order_source_options,
+      has_account_list,
+      usetypeOtions,
+      supplierName:"",
+      fileUrl: urlConfig.baseURL,
+      select: "outChildCode", //默认选择下拉框
+      s_input: "", //搜索框内容
+      select_list: [],
+      sitem: null,
+      // 状态
+      statusOptions: [
+        { value: "1", label: "待发货" },
+        { value: "2", label: "发货完成" },
+        // { value: "3", label: "已收货" },
+        // { value: "4", label: "已全部收货" },
+        { value: "5", label: "已取消" },
+      ],
+      loading: false,
+      showModel: false,
+      isDetail: false,
+      modelId: 0,
+      showModel:false,
+      parmValue: {
+        IsByMe:"1",
+        supplierName:"",
+        supplierNo:"",
+        customerName:"",
+        status: "",
+        has_account: "",
+        customer_code: [],
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        company_name: "",
+        good_code: "",
+        skuCode: "",
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        order_type: "",
+        use_type: "1",
+      },
+      tableData: [],
+      passwordModel: false,
+      passwordModelId: 0,
+      isPasswordDetail: false,
+      // 表格 - 数据
+      tableData: [],
+      // 表格 - 参数
+      table: {
+        stripe: true,
+        border: true,
+        _defaultHeader_: ["setcol"],
+      },
+      // 表格 - 分页
+      pageInfo: {
+        size: 15,
+        curr: 1,
+        total: 0,
+      },
+      // 表格 - 列参数
+      columns: columns,
+    };
+  },
+  mounted() {
+    const { back } = this.$route.query;
+    if (back) {
+      this.parmValue = JSON.parse(back);
+      const { page, size } = this.parmValue;
+      // this.parmValue.start = start || last_start;
+      // this.parmValue.end = end || last_end;
+      // if(this.parmValue.companyNo.length>0){
+      //     this.customerCode = [this.parmValue.companyNo] ;
+      // }
+
+      this.pageInfo = {
+        size: size,
+        curr: page,
+        total: 0,
+      };
+      //多选条件
+      this.select = this.parmValue.select;
+      // this.sselect = this.parmValue.sselect;
+      this.s_input = this.parmValue.s_input;
+    } else {
+      this.select = "outChildCode";
+      //  this.sselect = "创建时间"
+    }
+    this.searchList();
+  },
+
+  methods: {
+    async supplierChange(e) {
+      const { code, label } = e;
+      this.parmValue.supplierNo = code ? [code] : [];
+      this.parmValue.supplierName = label;
+      this.searchList();
+    },
+    customer_code_change(e) {
+      if (e && e.code) {
+        this.parmValue.customer_code = [e.code];
+        this.parmValue.customerName = e.label
+      } else {
+        this.parmValue.customer_code = [];
+        this.parmValue.customerName = ""
+      }
+      this.searchList();
+    },
+    openModal() {
+      this.showModel = true;
+    },
+    handleSelection(order) {
+      const { list } = order;
+      this.select_list = list;
+    },
+    getRouter(toRouter, queryId) {
+      if (toRouter && queryId) {
+        let model = {
+          id: queryId,
+        };
+
+        //有多选框的条件
+        this.parmValue.select = this.select;
+        // this.parmValue.sselect = this.sselect ;
+        this.parmValue.s_input = this.s_input;
+        let routerModel = {
+          options: JSON.parse(JSON.stringify(this.parmValue)),
+          router: this.$route.path,
+        };
+        model.preModel = JSON.stringify(routerModel);
+        this.routeGoto(toRouter, model);
+      }
+    },
+    restSearch() {
+      this.s_input = ""; //清除输入框内容
+      this.select = "outChildCode"; //清除下拉框选中项
+      this.parmValue = {
+        IsByMe:"1",
+        order_type: "",
+        company_name: "", //申请人部门
+        good_code: "",
+        returnCode: "", //销售退货code
+        orderCode: "", //销售订单code
+        apply_name: "", //申请人
+        start: "",
+        end: "",
+        status: "", //节点状态
+        page: 1, // 页码
+        size: 15, // 每页显示条数
+        use_type: "1",
+      };
+
+      // 表格 - 分页
+      this.pageInfo = {
+        size: 15,
+        total: 0,
+        curr: 1,
+      };
+
+      this.searchList();
+    },
+
+    openModal(id, isDetail, sitem) {
+      this.showModel = true;
+      this.modelId = id;
+      this.isDetail = isDetail;
+      this.sitem = sitem;
+    },
+    async deleteById(id, status) {
+      await this.$confirm("确定要删除？", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const model = {
+            id: id,
+            status: status + "" === "1" ? "0" : "1",
+          };
+          const res = await asyncRequest.status(model);
+          if (res && res.code === 0) {
+            this.$notify.success({
+              title: "删除成功",
+              message: "",
+            });
+            this.searchList();
+          } else if (res && res.code >= 100 && res.code <= 104) {
+            await this.logout();
+          } else {
+            this.$message.warning(res.message);
+          }
+        })
+        .catch(() => {
+          console.log("取消");
+        });
+    },
+    async searchList() {
+      if (
+        (this.parmValue.start !== "" && this.parmValue.end === "") ||
+        (this.parmValue.start === "" && this.parmValue.end !== "")
+      ) {
+        this.$message.warning("时间区间不完整！");
+        return;
+      }
+      this.loading = true;
+
+      let {supplierName,customerName,...model} = JSON.parse(JSON.stringify(this.parmValue));
+      delete model["s_input"];
+      delete model['IsByMe']
+
+      const res = await asyncRequest.list({
+        ...model,
+        [this.select]: this.s_input,
+        customer_code: Array.isArray(this.parmValue.customer_code)
+          ? this.parmValue.customer_code[0]
+          : this.parmValue.customer_code,
+        supplierNo: Array.isArray(this.parmValue.supplierNo) ? this.parmValue.supplierNo[0] : this.parmValue.supplierNo,
+        needRela: true,
+      });
+
+      if (res && res.code === 0 && res.data) {
+        this.tableData = res.data.list;
+        this.pageInfo.total = Number(res.data.count);
+      } else if (res && res.code >= 100 && res.code <= 104) {
+        await this.logout();
+      } else {
+        this.tableData = [];
+        this.pageInfo.total = 0;
+      }
+      this.loading = false;
+    },
+
+    //物流公司查询
+    async handleCompany(e) {
+      console.log(e, "要求传快递简称，不传id"); //
+      if (e && e.code) {
+        this.parmValue.postCompany = [e.shortName];
+        this.parmValue.page = 1;
+      }
+      await this.searchList();
+    },
+
+    company_idsearchChange(e) {
+      const { code } = e;
+      this.parmValue.companyNo = code || "";
+      this.searchList();
+    },
+
+    // 时间
+    async handleTime(e) {
+      if (e.startTime !== "") {
+        this.parmValue.start = e.startTime;
+      } else {
+        this.parmValue.start = "";
+      }
+      if (e.endTime !== "") {
+        this.parmValue.end = e.endTime;
+      } else {
+        this.parmValue.end = "";
+      }
+      if (this.parmValue.start !== "" && this.parmValue.end !== "") {
+        this.parmValue.page = 1;
+        await this.searchList();
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.sellReturn {
+}
+</style>

src/views/netOrderEntry/netOrderEnter/addEdit.vue

@@ -789,6 +789,7 @@ export default {
       }
 
       this.cat_id_name = cat_id.map(({ name }) => name).join('_')
+      console.log(this.cat_id_name)
       this.unit_name = unitName
 
       this.khName = khName

src/views/netOrderEntry/netOrderEnter/detail-modal.vue

@@ -73,23 +73,13 @@
               </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-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-input v-model="ruleForm.poCode" placeholder="PO编号" maxlength="50" :disabled="id === '007'" />
                 </el-form-item>
               </el-col>
 
@@ -127,23 +117,13 @@
             <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-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-input v-model="ruleForm.mobile" :disabled="id === '007'" placeholder="联系电话" maxlength="11" />
                 </el-form-item>
               </el-col>
 
@@ -175,12 +155,7 @@
 
               <el-col :span="24">
                 <el-form-item label="联系地址" prop="addr">
-                  <el-input
-                    v-model="ruleForm.addr"
-                    :disabled="id === '007'"
-                    maxlength="100"
-                    placeholder="联系地址"
-                  />
+                  <el-input v-model="ruleForm.addr" :disabled="id === '007'" maxlength="100" placeholder="联系地址" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -204,12 +179,7 @@
               </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-input v-model="ruleForm.goodName" placeholder="商品名称" maxlength="50" :disabled="id !== '003'" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -355,11 +325,7 @@
           </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 v-if="id !== '007'" type="primary" @click="submitForm">保 存</el-button>
           <el-button @click="showModelThis = false">
             {{ id == "007" ? "关 闭" : "取 消" }}
           </el-button>
@@ -845,6 +811,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.terrace {
-}
+.terrace {}
 </style>