【修改】bug

src/components/Common/image-upload.vue

@@ -257,7 +257,6 @@ export default {
     getFileName(name) {
       const fileName = name.substring(0, name.lastIndexOf('.'))
       let suffix = name.match(/.[^.]+$/)[0]
-      console.log(suffix, fileName)
       // 押金申请上传限制
       this.fileName = name
       if (this.startRestricting) {
@@ -265,11 +264,11 @@ export default {
         const filterKeywords = this.restrictFilename.filter(k => fileName.includes(k))
         // filterKeywords = 0 || 'zip', 'rar', 'gz', 'apk' 归为 其他文件
         if (!filterKeywords.length || suffix.includes('zip', 'rar', 'gz', 'apk')) {
-          this.fileName = `其他文件${suffix}`
+          this.fileName = `其他文件-${fileName}${suffix}`
         }
         // 限制照片/相片名称统一为照片 ， restrictFilename[restrictFilename.length-1|restrictFilename.length-1]为照片、相片
         if (fileName.includes('相片') || fileName.includes('照片')) {
-          this.fileName = `照片${suffix}`
+          this.fileName = `照片-${fileName}${suffix}`
         }
       }
     }

src/views/supply/engin/components/commerce_form.vue

@@ -279,6 +279,11 @@
             <el-input v-model="scope.row.qty" size="small" />
           </template>
         </el-table-column>
+        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>{{ status2Filter(scope.row) }}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="订单金额" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price * scope.row.qty }}
@@ -355,11 +360,6 @@
         </el-table-column>
         <el-table-column align="center" label="税率" prop="tax" min-width="100" show-overflow-tooltip />
         <el-table-column align="center" label="仓库" prop="correspondName" min-width="100" show-overflow-tooltip />
-        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <div>{{ status2Filter(scope.row) }}</div>
-          </template>
-        </el-table-column>
 
         <el-table-column align="center" label="业务员" prop="serviceId" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/supply/engin/components/engin_examine.vue

@@ -44,7 +44,10 @@
         <el-col :span="8" class="item">
           <div class="label">项目名称</div>
           <div class="value">
-            <el-input v-model="detailData.projectName" placeholder="请输入项目名称"></el-input>
+            <el-input
+              v-model="detailData.projectName"
+              placeholder="请输入项目名称"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -74,7 +77,10 @@
         <el-col :span="8" class="item">
           <div class="label">使用单位</div>
           <div class="value">
-            <el-input v-model="detailData.useUnit" placeholder="请输入使用单位"></el-input>
+            <el-input
+              v-model="detailData.useUnit"
+              placeholder="请输入使用单位"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -87,7 +93,12 @@
               clearable
               style="width: 100%"
             >
-              <el-option v-for="item in tradeCategoryList" :key="item.value" :label="item.label" :value="item.value">
+              <el-option
+                v-for="item in tradeCategoryList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </div>
@@ -95,13 +106,19 @@
         <el-col :span="8" class="item">
           <div class="label">工程编号</div>
           <div class="value">
-            <el-input v-model="detailData.projectNo" placeholder="请输入工程编号"></el-input>
+            <el-input
+              v-model="detailData.projectNo"
+              placeholder="请输入工程编号"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">厂工程编码</div>
           <div class="value">
-            <el-input v-model="detailData.enginFactoryNo" placeholder="请输入厂工程编码"></el-input>
+            <el-input
+              v-model="detailData.enginFactoryNo"
+              placeholder="请输入厂工程编码"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -127,19 +144,28 @@
         <el-col :span="8" class="item">
           <div class="label">联系人</div>
           <div class="value">
-            <el-input v-model="detailData.linkman" placeholder="请输入联系人"></el-input>
+            <el-input
+              v-model="detailData.linkman"
+              placeholder="请输入联系人"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">联系电话</div>
           <div class="value">
-            <el-input v-model="detailData.phone" placeholder="请输入联系电话"></el-input>
+            <el-input
+              v-model="detailData.phone"
+              placeholder="请输入联系电话"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
           <div class="label">固定电话</div>
           <div class="value">
-            <el-input v-model="detailData.tel" placeholder="请输入固定电话"></el-input>
+            <el-input
+              v-model="detailData.tel"
+              placeholder="请输入固定电话"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -149,25 +175,37 @@
         <el-col :span="24" class="item">
           <div class="label">安装地址</div>
           <div class="value">
-            <el-input v-model="detailData.installAddress" placeholder="请输入安装地址"></el-input>
+            <el-input
+              v-model="detailData.installAddress"
+              placeholder="请输入安装地址"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item" v-if="!isCustomer">
           <div class="label">格力内部备注</div>
           <div class="value">
-            <el-input v-model="detailData.geLiInerNote" placeholder="请输入格力内部备注"></el-input>
+            <el-input
+              v-model="detailData.geLiInerNote"
+              placeholder="请输入格力内部备注"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">格力回复</div>
           <div class="value">
-            <el-input v-model="detailData.geLiNote" placeholder="请输入格力回复"></el-input>
+            <el-input
+              v-model="detailData.geLiNote"
+              placeholder="请输入格力回复"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">备注</div>
           <div class="value">
-            <el-input v-model="detailData.remark" placeholder="请输入备注"></el-input>
+            <el-input
+              v-model="detailData.remark"
+              placeholder="请输入备注"
+            ></el-input>
           </div>
         </el-col>
         <el-col :span="8" class="item">
@@ -198,7 +236,13 @@
     <div class="main-title">
       <div class="title">货品信息</div>
       <div>
-        <el-button type="primary" size="small" icon="el-icon-plus" @click="openDialog">添加货品</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          icon="el-icon-plus"
+          @click="openDialog"
+          >添加货品</el-button
+        >
       </div>
     </div>
 
@@ -214,7 +258,12 @@
         show-summary
         :summary-method="$getSummaries"
       >
-        <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
+        <el-table-column
+          align="center"
+          label="序号"
+          type="index"
+          width="50"
+        ></el-table-column>
         <el-table-column
           align="left"
           label="销售类型"
@@ -243,28 +292,74 @@
           min-width="160"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
+        <el-table-column
+          align="left"
+          label="规格型号"
+          prop="specification"
+          min-width="160"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <el-input v-model="scope.row.specification" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+        <el-table-column
+          align="left"
+          label="单位"
+          prop="unit"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          align="right"
+          label="单价"
+          prop="price"
+          min-width="100"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            <el-input v-model="scope.row.price" size="small" type="number" @mousewheel.native.prevent></el-input>
+            <el-input
+              v-model="scope.row.price"
+              size="small"
+              type="number"
+              @mousewheel.native.prevent
+            ></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="right" label="数量" prop="qty" min-width="100" show-overflow-tooltip>
+        <el-table-column
+          align="right"
+          label="数量"
+          prop="qty"
+          min-width="100"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            <el-input v-model="scope.row.qty" size="small" type="number" @mousewheel.native.prevent></el-input>
+            <el-input
+              v-model="scope.row.qty"
+              size="small"
+              type="number"
+              @mousewheel.native.prevent
+            ></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="right" label="订单金额" min-width="100" prop="compute_amount" show-overflow-tooltip>
+        <el-table-column
+          align="right"
+          label="订单金额"
+          min-width="100"
+          prop="compute_amount"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             {{ scope.row.compute_amount | numToFixed }}
           </template>
         </el-table-column>
-        <el-table-column align="left" label="备注" prop="remark" min-width="200" show-overflow-tooltip>
+        <el-table-column
+          align="left"
+          label="备注"
+          prop="remark"
+          min-width="200"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
@@ -278,7 +373,9 @@
         ></el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
+            <el-button type="text" @click="deleteItem(scope.$index)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -304,28 +401,50 @@
         </el-col>
         <el-col :span="24" class="item">
           <div class="label">审批说明</div>
-          <div class="value"><el-input v-model="examineForm.remark" placeholder="请输入内容"></el-input></div>
+          <div class="value">
+            <el-input
+              v-model="examineForm.remark"
+              placeholder="请输入内容"
+            ></el-input>
+          </div>
         </el-col>
       </el-row>
     </div>
 
     <div class="page-footer">
       <div class="footer">
-        <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{
-          formLoading ? '提交中 ...' : '提 交'
-        }}</el-button>
-        <el-popconfirm title="确定关闭吗？" @onConfirm="goBack" style="margin-left: 10px">
+        <el-button
+          type="primary"
+          @click="clickSubmitForm"
+          :loading="formLoading"
+          >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
+        >
+        <el-popconfirm
+          title="确定关闭吗？"
+          @onConfirm="goBack"
+          style="margin-left: 10px"
+        >
           <el-button slot="reference">返回列表</el-button>
         </el-popconfirm>
       </div>
     </div>
 
     <el-dialog title="添加产品" :visible.sync="isShowGoodsDialog" width="80%">
-      <el-form ref="goodsScreenForm" :model="goodsScreenForm" size="small" label-position="left">
+      <el-form
+        ref="goodsScreenForm"
+        :model="goodsScreenForm"
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="salesType">
-              <el-select v-model="goodsScreenForm.salesType" placeholder="选择销售类型" style="width: 100%" clearable>
+              <el-select
+                v-model="goodsScreenForm.salesType"
+                placeholder="选择销售类型"
+                style="width: 100%"
+                clearable
+              >
                 <el-option
                   v-for="item in salesTypeList"
                   :key="item.id"
@@ -337,30 +456,54 @@
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proNum">
-              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入产品编码"></el-input>
+              <el-input
+                v-model="goodsScreenForm.proNum"
+                placeholder="请输入产品编码"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proName">
-              <el-input v-model="goodsScreenForm.proName" placeholder="请输入产品名称"></el-input>
+              <el-input
+                v-model="goodsScreenForm.proName"
+                placeholder="请输入产品名称"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proModel">
-              <el-input v-model="goodsScreenForm.proModel" placeholder="请输入产品型号"></el-input>
+              <el-input
+                v-model="goodsScreenForm.proModel"
+                placeholder="请输入产品型号"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="price1" style="display: flex">
-              <el-input v-model="goodsScreenForm.price1" placeholder="请输入价格" style="width: 46%"></el-input>
+              <el-input
+                v-model="goodsScreenForm.price1"
+                placeholder="请输入价格"
+                style="width: 46%"
+              ></el-input>
               <span> - </span>
-              <el-input v-model="goodsScreenForm.price2" placeholder="请输入价格" style="width: 46%"></el-input>
+              <el-input
+                v-model="goodsScreenForm.price2"
+                placeholder="请输入价格"
+                style="width: 46%"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="18" :lg="18" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetGoodsScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitGoodsScreenForm">搜索</el-button>
+              <el-button size="small" @click="resetGoodsScreenForm"
+                >清空</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                @click="submitGoodsScreenForm"
+                >搜索</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
@@ -378,7 +521,12 @@
             height="400"
             @selection-change="leftSelectionChange"
           >
-            <el-table-column align="center" type="selection" width="55" :selectable="checkboxSelect"></el-table-column>
+            <el-table-column
+              align="center"
+              type="selection"
+              width="55"
+              :selectable="checkboxSelect"
+            ></el-table-column>
             <el-table-column
               align="center"
               label="产品编码"
@@ -423,10 +571,18 @@
           </div>
         </div>
         <div class="buttons">
-          <el-button size="small" type="primary" @click="addAllGoods">全部添加</el-button>
-          <el-button size="small" type="primary" @click="addGoods">添&emsp;加</el-button>
-          <el-button size="small" type="danger" @click="deleteGoods">删&emsp;除</el-button>
-          <el-button size="small" type="danger" @click="deleteAllGoods">全部删除</el-button>
+          <el-button size="small" type="primary" @click="addAllGoods"
+            >全部添加</el-button
+          >
+          <el-button size="small" type="primary" @click="addGoods"
+            >添&emsp;加</el-button
+          >
+          <el-button size="small" type="danger" @click="deleteGoods"
+            >删&emsp;除</el-button
+          >
+          <el-button size="small" type="danger" @click="deleteAllGoods"
+            >全部删除</el-button
+          >
         </div>
         <div class="table">
           <el-table
@@ -439,7 +595,11 @@
             height="400"
             @selection-change="rightSelectionChange"
           >
-            <el-table-column align="center" type="selection" width="55"></el-table-column>
+            <el-table-column
+              align="center"
+              type="selection"
+              width="55"
+            ></el-table-column>
             <el-table-column
               align="center"
               label="产品编码"
@@ -481,66 +641,68 @@
 </template>
 
 <script>
-import { getEnginDetail, getRetailProductList, examineEngin } from '@/api/supply/engin'
-import { getTypeList, getSalesmanList, getDictList } from '@/api/common'
-import { mapGetters } from 'vuex'
+import {
+  getEnginDetail,
+  getRetailProductList,
+  examineEngin,
+} from "@/api/supply/engin";
+import { getTypeList, getSalesmanList, getDictList } from "@/api/common";
+import { mapGetters } from "vuex";
 
 export default {
-  name: 'EnginExamine',
-  componentName: 'EnginExamine',
-  props: ['listItem'],
+  name: "EnginExamine",
+  componentName: "EnginExamine",
+  props: ["listItem"],
   filters: {
     statusFilter(val) {
       const statusList = [
-        { label: '已保存', value: 'SAVE' },
-        { label: '待审核', value: 'WAIT' },
-        { label: '审核通过', value: 'OK' },
+        { label: "已保存", value: "SAVE" },
+        { label: "待审核", value: "WAIT" },
+        { label: "审核通过", value: "OK" },
         // { label: '审核驳回', value: 'FAIL' },,
-        { label: '已关闭', value: 'CLOSE' }
-      ]
-      let obj = statusList.find(o => o.value == val)
-      return obj ? obj.label : ''
-    }
+        { label: "已关闭", value: "CLOSE" },
+      ];
+      let obj = statusList.find((o) => o.value == val);
+      return obj ? obj.label : "";
+    },
   },
   data() {
     return {
       detailData: {},
       goodsList: [],
-      userName: JSON.parse(localStorage.getItem('supply_user')).nickName,
+      userName: JSON.parse(localStorage.getItem("supply_user")).nickName,
 
       formLoading: false,
       examineForm: {
         examineResult: true,
-        remark: ''
+        remark: "",
       },
-
-      salesTypeList: [],
       salesmanList: [],
       machineTypeList: [],
       loginTypeList: [],
       powerList: [],
       tradeCategoryList: [
-        { value: '房地产', label: '房地产' },
-        { value: '公共建筑', label: '公共建筑' },
-        { value: '工业制造', label: '工业制造' },
-        { value: '商业项目', label: '商业项目' },
-        { value: '采暖及清洁能源', label: '采暖及清洁能源' },
-        { value: '轨道交通', label: '轨道交通' },
-        { value: '数据通讯', label: '数据通讯' },
-        { value: '冷冻冷藏', label: '冷冻冷藏' },
-        { value: '高端制造', label: '高端制造' },
-        { value: '医院医疗', label: '医院医疗' },
-        { value: '其他', label: '其他' }
+        { value: "房地产", label: "房地产" },
+        { value: "公共建筑", label: "公共建筑" },
+        { value: "工业制造", label: "工业制造" },
+        { value: "商业项目", label: "商业项目" },
+        { value: "采暖及清洁能源", label: "采暖及清洁能源" },
+        { value: "轨道交通", label: "轨道交通" },
+        { value: "数据通讯", label: "数据通讯" },
+        { value: "冷冻冷藏", label: "冷冻冷藏" },
+        { value: "高端制造", label: "高端制造" },
+        { value: "医院医疗", label: "医院医疗" },
+        { value: "其他", label: "其他" },
       ],
 
       isShowGoodsDialog: false,
       goodsScreenForm: {
-        proNum: '',
-        proName: '',
-        proModel: '',
-        price1: '',
-        price2: '',
-        salesType: ''
+        proNum: "",
+        proName: "",
+        proModel: "",
+        price1: "",
+        price2: "",
+        salesType: "",
       },
       currentPage: 1,
       listTotal: 0,
@@ -551,12 +713,12 @@ export default {
       leftSelection: [],
       rightSelection: [],
 
-      salesTypeList: []
-    }
+      salesTypeList: [],
+    };
   },
 
   computed: {
-    ...mapGetters(['isCustomer'])
+    ...mapGetters(["isCustomer"]),
   },
 
   watch: {
@@ -564,48 +726,48 @@ export default {
       handler(newValue, oldValue) {
         if (newValue && newValue.length) {
           newValue.forEach((item, index) => {
-            this.goodsList[index].compute_amount = item.price * item.qty
-          })
+            this.goodsList[index].compute_amount = item.price * item.qty;
+          });
         }
       },
       immediate: true,
-      deep: true
-    }
+      deep: true,
+    },
   },
 
   created() {
-    this.getDetail()
-    this.getTypeList()
-    this.getSalesmanList()
-    this.getDictList()
+    this.getDetail();
+    this.getTypeList();
+    this.getSalesmanList();
+    this.getDictList();
   },
 
   methods: {
     // 返回列表
     goBack() {
-      this.$emit('backListFormDetail')
+      this.$emit("backListFormDetail");
     },
 
     // 获取详情
     getDetail() {
-      getEnginDetail({ id: this.listItem.enginInfoId }).then(res => {
-        this.detailData = res.data
-        res.data.items.forEach(item => {
-          item.sums1 = ['qty', 'hasOrderQty', 'hasDeliverQty']
-          item.sums2 = ['compute_amount', 'price']
-        })
-        this.goodsList = res.data.items
-      })
+      getEnginDetail({ id: this.listItem.enginInfoId }).then((res) => {
+        this.detailData = res.data;
+        res.data.items.forEach((item) => {
+          item.sums1 = ["qty", "hasOrderQty", "hasDeliverQty"];
+          item.sums2 = ["compute_amount", "price"];
+        });
+        this.goodsList = res.data.items;
+      });
     },
 
     // 获取销售类型列表
     getTypeList() {
       getTypeList({
         pageNum: 1,
-        pageSize: -1
-      }).then(res => {
-        this.salesTypeList = res.data.records
-      })
+        pageSize: -1,
+      }).then((res) => {
+        this.salesTypeList = res.data.records;
+      });
     },
 
     getSalesmanList() {
@@ -613,23 +775,23 @@ export default {
         pageNum: 1,
         pageSize: -1,
         isCustomer: 0,
-        status: true
-      }).then(res => {
-        this.salesmanList = res.data.records
-      })
+        status: true,
+      }).then((res) => {
+        this.salesmanList = res.data.records;
+      });
     },
 
     // 获取产品大类列表
     getDictList() {
-      getDictList({ sysDictEnum: 'MACHINE_TYPE' }).then(res => {
-        this.machineTypeList = res.data
-      })
-      getDictList({ sysDictEnum: 'POWER_CATEGORY' }).then(res => {
-        this.powerList = res.data
-      })
-      getDictList({ sysDictEnum: 'SIGN_TYPE' }).then(res => {
-        this.loginTypeList = res.data
-      })
+      getDictList({ sysDictEnum: "MACHINE_TYPE" }).then((res) => {
+        this.machineTypeList = res.data;
+      });
+      getDictList({ sysDictEnum: "POWER_CATEGORY" }).then((res) => {
+        this.powerList = res.data;
+      });
+      getDictList({ sysDictEnum: "SIGN_TYPE" }).then((res) => {
+        this.loginTypeList = res.data;
+      });
     },
 
     // 获取商品列表
@@ -642,130 +804,136 @@ export default {
         materialName: this.goodsScreenForm.proName,
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,
-        price2: this.goodsScreenForm.price2
-      }).then(res => {
-        let oldGoodsList = this.goodsList
-        let newGoodsList = res.data.records
+        price2: this.goodsScreenForm.price2,
+      }).then((res) => {
+        let oldGoodsList = this.goodsList;
+        let newGoodsList = res.data.records;
         for (let i = 0; i < oldGoodsList.length; i++) {
-          let oldItem = oldGoodsList[i]
+          let oldItem = oldGoodsList[i];
           for (let j = 0; j < newGoodsList.length; j++) {
-            let newItem = newGoodsList[j]
+            let newItem = newGoodsList[j];
             if (newItem.id === oldItem.id) {
-              newGoodsList[j].selected = true
-              break
+              newGoodsList[j].selected = true;
+              break;
             }
           }
         }
-        res.data.records.forEach(item => {
-          item.materialName = item.name
-          item.materialCode = item.number
-          item.saleTypeName = item.saleName
-          item.unit = item.baseUnit
-          item.price = item.batchPrice
-          item.tax = item.taxRate
-          item.isDirectTransfer = false
-          item.directTransferQty = ''
-          item.status1 = ''
-          item.status2 = ''
-          item.rebateAmount = ''
-          item.rebateRate = ''
-          item.productPriceId = item.id
+        res.data.records.forEach((item) => {
+          item.materialName = item.name;
+          item.materialCode = item.number;
+          item.saleTypeName = item.saleName;
+          item.unit = item.baseUnit;
+          item.price = item.batchPrice;
+          item.tax = item.taxRate;
+          item.isDirectTransfer = false;
+          item.directTransferQty = "";
+          item.status1 = "";
+          item.status2 = "";
+          item.rebateAmount = "";
+          item.rebateRate = "";
+          item.productPriceId = item.id;
           // item.customerWalletId = (item.wallets && item.wallets.length) ? item.wallets[0].customerWalletId : '';
-        })
-        this.leftGoodsList = res.data.records
-        this.listTotal = res.data.total
-      })
+        });
+        this.leftGoodsList = res.data.records;
+        this.listTotal = res.data.total;
+      });
     },
 
     // 查询重复值并禁选
     checkboxSelect(row, rowIndex) {
       if (row.selected) {
-        return false // 禁用
+        return false; // 禁用
       } else {
-        return true // 不禁用
+        return true; // 不禁用
       }
     },
 
     // 点击 选择商品
     openDialog() {
-      this.isShowGoodsDialog = true
-      this.getGoodsList()
+      this.isShowGoodsDialog = true;
+      this.getGoodsList();
     },
 
     // 提交筛选表单
     submitGoodsScreenForm() {
-      this.currentPage = 1
-      this.getGoodsList()
+      this.currentPage = 1;
+      this.getGoodsList();
     },
 
     // 重置筛选表单
     resetGoodsScreenForm() {
-      this.$refs.goodsScreenForm.resetFields()
-      this.currentPage = 1
-      this.getGoodsList()
+      this.$refs.goodsScreenForm.resetFields();
+      this.currentPage = 1;
+      this.getGoodsList();
     },
 
     // 更改列表当前页
     handleTableCurrentChange(val) {
-      this.currentPage = val
-      this.getGoodsList()
+      this.currentPage = val;
+      this.getGoodsList();
     },
 
     // 关闭 弹窗
     closeDialog() {
-      this.isShowGoodsDialog = false
+      this.isShowGoodsDialog = false;
     },
 
     // 左侧列表选择
     leftSelectionChange(val) {
-      this.leftSelection = val
+      this.leftSelection = val;
     },
 
     // 右侧列表选择
     rightSelectionChange(val) {
-      this.rightSelection = val
+      this.rightSelection = val;
     },
 
     // 数组去重
     delRepeat(arr1, arr2) {
-      let allArr = arr1.concat(arr2) // 两个数组对象合并
-      let newArr = [] // 存放去重后数据的新数组
+      let allArr = arr1.concat(arr2); // 两个数组对象合并
+      let newArr = []; // 存放去重后数据的新数组
       for (let i = 0; i < allArr.length; i++) {
         // 循环allArr数组对象的内容
-        let flag = true // 建立标记，判断数据是否重复，true为不重复
+        let flag = true; // 建立标记，判断数据是否重复，true为不重复
         for (let j = 0; j < newArr.length; j++) {
           // 循环新数组的内容
           if (allArr[i].id == newArr[j].id) {
             // 让allArr数组对象的内容与新数组的内容作比较，相同的话，改变标记为false
-            flag = false
+            flag = false;
           }
         }
         if (flag) {
           // 判断是否重复
-          newArr.push(allArr[i]) // 不重复的放入新数组。  新数组的内容会继续进行上边的循环。
+          newArr.push(allArr[i]); // 不重复的放入新数组。  新数组的内容会继续进行上边的循环。
         }
       }
-      return newArr
+      return newArr;
     },
 
     // 全部添加
     addAllGoods() {
-      this.rightGoodsList = this.delRepeat(this.leftGoodsList, this.rightGoodsList)
+      this.rightGoodsList = this.delRepeat(
+        this.leftGoodsList,
+        this.rightGoodsList
+      );
     },
 
     // 添加
     addGoods() {
-      this.rightGoodsList = this.delRepeat(this.leftSelection, this.rightGoodsList)
+      this.rightGoodsList = this.delRepeat(
+        this.leftSelection,
+        this.rightGoodsList
+      );
     },
 
     // 删除
     deleteGoods() {
-      let rightGoodsList = this.rightGoodsList
-      let rightSelection = this.rightSelection
+      let rightGoodsList = this.rightGoodsList;
+      let rightSelection = this.rightSelection;
       for (let i = 0; i < rightGoodsList.length; i++) {
         for (let j = 0; j < rightSelection.length; j++) {
           if (rightSelection[j].materialId == rightGoodsList[i].materialId) {
-            this.rightGoodsList.splice(i, 1)
+            this.rightGoodsList.splice(i, 1);
           }
         }
       }
@@ -773,56 +941,58 @@ export default {
 
     // 全部删除
     deleteAllGoods() {
-      this.rightGoodsList = []
+      this.rightGoodsList = [];
     },
 
     // 确定 添加产品
     submitAddGoods() {
       // this.goodsList = this.delRepeat(this.rightGoodsList, this.goodsList);
-      this.goodsList = this.goodsList.concat(this.rightGoodsList)
-      this.isShowGoodsDialog = false
-      this.leftGoodsList = []
-      this.rightGoodsList = []
+      this.goodsList = this.goodsList.concat(this.rightGoodsList);
+      this.isShowGoodsDialog = false;
+      this.leftGoodsList = [];
+      this.rightGoodsList = [];
     },
 
     // 删除产品
     deleteItem(index) {
-      this.goodsList.splice(index, 1)
+      this.goodsList.splice(index, 1);
     },
 
     clickSubmitForm() {
       if (!this.detailData.serviceId) {
-        return this.$errorMsg('请选择业务员')
+        return this.$errorMsg("请选择业务员");
       }
-      this.$confirm('此操作将审批订单, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+      this.$confirm("此操作将审批订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
       })
         .then(() => {
-          let saleManItem = this.salesmanList.find(o => o.adminUserId == this.detailData.serviceId)
-          let params = JSON.parse(JSON.stringify(this.detailData))
-          params.enginInfoId = this.listItem.enginInfoId
-          params.mainId = this.listItem.mainId
-          params.examineResult = this.examineForm.examineResult
-          params.examineNote = this.examineForm.remark
-          params.serviceName = saleManItem.nickName
-          params.items = this.goodsList
-          this.formLoading = true
+          let saleManItem = this.salesmanList.find(
+            (o) => o.adminUserId == this.detailData.serviceId
+          );
+          let params = JSON.parse(JSON.stringify(this.detailData));
+          params.enginInfoId = this.listItem.enginInfoId;
+          params.mainId = this.listItem.mainId;
+          params.examineResult = this.examineForm.examineResult;
+          params.examineNote = this.examineForm.remark;
+          params.serviceName = saleManItem.nickName;
+          params.items = this.goodsList;
+          this.formLoading = true;
           examineEngin(params)
-            .then(res => {
-              this.$successMsg('审批成功')
-              this.goBack()
-              this.$parent.getList()
-            })
-            .finally(res => {
-              this.formLoading = false
+            .then((res) => {
+              this.$successMsg("审批成功");
+              this.goBack();
+              this.$parent.getList();
             })
+            .finally((res) => {
+              this.formLoading = false;
+            });
         })
-        .catch(() => {})
-    }
-  }
-}
+        .catch(() => {});
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -868,7 +1038,7 @@ export default {
 ::v-deep input::-webkit-inner-spin-button {
   -webkit-appearance: none;
 }
-::v-deep input[type='number'] {
+::v-deep input[type="number"] {
   -moz-appearance: textfield;
 }
 </style>