Merge branch 'master' into feat-two

src/components/Common/edit-date-dialog.vue

@@ -57,7 +57,8 @@ export default {
     submitDateForm() {
       this.$refs.dateForm.validate(valid => {
         if (valid) {
-          this.$parent.submitDateForm()
+          // this.$parent.submitDateForm()
+          this.$emit('submit')
         }
       })
     }

src/views/supply/apply/components/design/preview.vue

@@ -81,6 +81,7 @@ export default {
       }, 500)
     },
     print() {
+      this.waitShowPrinter = true
       try {
         if (typeof this.addPrint === 'function') {
           this.addPrint('addPrints').then(() => {

src/views/supply/deliver/components/design/preview.vue

@@ -80,6 +80,8 @@ export default {
       }, 500)
     },
     print() {
+      this.waitShowPrinter = true
+
       try {
         if (typeof this.addPrint === 'function') {
           this.addPrint('addPrints').then(() => {

src/views/supply/engin/commerce_list.vue

@@ -11,7 +11,7 @@
     :fieldBeansHook="fieldBeansHook"
     :operationColumnWidth="200"
   >
-    <!-- <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" /> -->
+    <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" @submit="submitDateForm" />
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">
       <CommerceDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
       <CommerceForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
@@ -210,6 +210,28 @@ export default {
     exportList: v2EnginOrderTradeListExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.colName === 'order_date') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div class="dateClass">
+              <span>{row.orderDate}</span>
+              {this.$checkBtnRole('date', this.$route.meta.roles) &&
+              !this.isCustomer &&
+              row.examineStatus !== '保存' ? (
+                <el-button
+                  type="text"
+                  icon="el-icon-edit"
+                  style="padding: 0; margin-left: 6px"
+                  onClick={() => this.editDate(row)}
+                />
+              ) : (
+                ''
+              )}
+            </div>
+          )
+        }
+      }
+
       return defaultData
     },
     // 监听勾选变化
@@ -548,7 +570,8 @@ export default {
         orderDate: this.dateForm.date + ' 00:00:00'
       }).then(res => {
         this.isShowEditDateDialog = false
-        this.getList()
+        // this.getList()
+        this.$refs.pageRef.refreshList()
         this.$successMsg('修改成功')
       })
     }

src/views/supply/engin/home_list.vue

@@ -38,7 +38,7 @@
         </div>
       </div>
     </div>
-    <!-- <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" /> -->
+    <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" @submit="submitDateForm" />
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">
       <HomeDetail v-if="isShowDetail" :list-item="queryItem" @backListFormDetail="backList" />
       <HomeForm v-if="isShowForm" :list-item="queryItem" @backListFormDetail="backList" />
@@ -348,6 +348,29 @@ export default {
     exportList: v2EnginOrderHomeListExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      // console.log(item)
+      if (item.colName === 'order_date') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div class="dateClass">
+              <span>{row.orderDate}</span>
+              {this.$checkBtnRole('date', this.$route.meta.roles) &&
+              !this.isCustomer &&
+              row.examineStatus !== '保存' ? (
+                <el-button
+                  type="text"
+                  icon="el-icon-edit"
+                  style="padding: 0; margin-left: 6px"
+                  onClick={() => this.editDate(row)}
+                />
+              ) : (
+                ''
+              )}
+            </div>
+          )
+        }
+      }
+
       return defaultData
     },
     // 监听勾选变化
@@ -742,7 +765,8 @@ export default {
         refEnginRecordNo: this.screenForm.loginNum
       }).then(res => {
         this.isShowEditDateDialog = false
-        this.getList()
+        // this.getList()
+        this.$refs.pageRef.refreshList()
         this.$successMsg('修改成功')
       })
     }

src/views/supply/pickup/components/design/preview.vue

@@ -90,6 +90,7 @@ export default {
       }, 500)
     },
     async print() {
+      this.waitShowPrinter = true
       if (this.getNewDetailPrintDisString) {
         try {
           const { data } = await this.getNewDetailPrintDisString()
@@ -136,6 +137,7 @@ export default {
             }).then(() => {
               this.getOvalDateil()
               this.flag = true
+              this.waitShowPrinter = false
             })
           }
         } catch (error) {

src/views/supply/policy/components/retail_form.vue

@@ -347,9 +347,12 @@
               <el-form-item label="规格型号">
                 <div style="display: flex">
                   <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
-                  <el-button style="margin-left: 10px" type="primary" size="mini" @click="handleGetPolicyList"
-                    >查询</el-button
-                  >
+                  <el-button
+                    style="margin-left: 10px"
+                    type="primary"
+                    size="mini"
+                    @click="handleGetPolicyList"
+                  >查询</el-button>
                 </div>
               </el-form-item>
             </el-col>
@@ -365,9 +368,10 @@
                 >
                   <el-option v-for="item in policyList" :key="item.code" :label="item.title" :value="item.code">
                     <span>{{ item.title }}</span>
-                    <span v-if="item.policyRemark" style="margin-left: 15px; color: #f00; font-size: 12px"
-                      >（ {{ item.policyRemark }} ）</span
-                    >
+                    <span
+                      v-if="item.policyRemark"
+                      style="margin-left: 15px; color: #f00; font-size: 12px"
+                    >（ {{ item.policyRemark }} ）</span>
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -865,6 +869,7 @@ export default {
               this.$set(this.goodsList[index], 'isDirectTransfer', true)
             }
             this.goodsList[index].policyConditionId = this.policyConditionId
+            this.goodsList[index].policyConditionId = this.policyConditionId || this.goodsList[index].policyConditionId
             if (this.correspondId) {
               this.goodsList[index].correspondName = this.correspondName
               this.goodsList[index].correspondId = this.correspondId
@@ -1067,10 +1072,13 @@ export default {
           this.screenForm.policyId = this.policyId
           if (this.listItem) {
             this.policyConditionId = data[0].id
+            console.log('edit', this.policyConditionId);
+
           }
         } else {
           this.screenForm.policyId = data[0].policyId
           this.policyConditionId = data[0].id
+          console.log('xinz', this.policyConditionId);
         }
 
         for (let i = 0; i < this.popArr.length; i++) {
@@ -1109,6 +1117,7 @@ export default {
 
       this.screenForm.policyId = data.policyId
       this.policyConditionId = data.id
+      console.log('获取条件相对应的比列', this.policyConditionId );
     },
     async handleGetPolicyList() {
       const { data } = await policyList({
@@ -1269,7 +1278,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function (row, index) {
+    selectable: function(row, index) {
       // row.disabled == undefined 才能被选中
       if (row.disabled == undefined) {
         return true
@@ -1285,7 +1294,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable2: function (row, index) {
+    selectable2: function(row, index) {
       // row.disabled == undefined 才能被选中
       if (row.disabled == undefined) {
         return true
@@ -1921,6 +1930,7 @@ export default {
               this.goBack()
             })
           } else {
+            console.log('添加成功',this.policyConditionId);
             params.retailOrderItemList.forEach(k => {
               k.id = null
               k.policyConditionId = this.policyConditionId

src/views/supply/policy/policy_list.vue

@@ -8,9 +8,10 @@
     :columnParsing="columnParsing"
     :tableEvents="tableEvents"
     :tableAttributes="tableAttributes"
+    :operationColumnWidth="200"
   >
     <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" @submit="submitExamineForm" />
-    <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" />
+    <EditDateDialog :is-show.sync="isShowEditDateDialog" :date-form.sync="dateForm" @submit="submitDateForm" />
 
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">
       <RetailDetail v-if="isShowDetail" :list-item="queryItem" @backListFormDetail="backList" />
@@ -176,6 +177,26 @@ export default {
     exportList: exportRetailListV2,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.colName === 'the_time') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div class="dateClass">
+              <span>{row.theTime}</span>
+              {this.$checkBtnRole('date', this.$route.meta.roles) ? (
+                <el-button
+                  type="text"
+                  icon="el-icon-edit"
+                  style="padding: 0; margin-left: 6px"
+                  onClick={() => this.editDate(row)}
+                />
+              ) : (
+                ''
+              )}
+            </div>
+          )
+        }
+      }
+
       return defaultData
     },
     // 监听勾选变化
@@ -189,54 +210,54 @@ export default {
           <div class="operation-btns">
             {row.examineStatus === statusData['SAVE'] ? (
               <el-popconfirm title="确定提审？" onOnConfirm={() => this.handleSubmit(row.id)}>
-                <el-button slot="reference" type="text">
+                <el-button slot="reference" size="mini" type="text">
                   提审
                 </el-button>
               </el-popconfirm>
             ) : null}
             {row.examineStatus == statusData['WAIT'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
-              <el-button type="text" onClick={() => this.toExamine(row)}>
+              <el-button type="text" size="mini" onClick={() => this.toExamine(row)}>
                 审核
               </el-button>
             ) : null}
             {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
               <el-popconfirm title="确定删除吗？" onOnConfirm={() => this.handleDelete(row.id)}>
-                <el-button slot="reference" type="text">
+                <el-button slot="reference" size="mini" type="text">
                   删除
                 </el-button>
               </el-popconfirm>
             ) : null}
             {row.examineStatus === statusData['SAVE'] && this.$checkBtnRole('edit', this.$route.meta.roles) ? (
-              <el-button type="text" onClick={()=>this.toForm(row)}>
+              <el-button type="text" size="mini" onClick={() => this.toForm(row)}>
                 编辑
               </el-button>
             ) : null}
             {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['OK'] ? (
               <el-popconfirm title="确定弃审吗？" onOnConfirm={() => this.handleAbandon(row.id)}>
-                <el-button slot="reference" type="text">
+                <el-button slot="reference" size="mini" type="text">
                   弃审
                 </el-button>
               </el-popconfirm>
             ) : null}
             {row.examineStatus == statusData['WAIT'] && this.$checkBtnRole('apply', this.$route.meta.roles) ? (
               <el-popconfirm title="确定撤回？" onOnConfirm={() => this.handleCancel(row.id)}>
-                <el-button slot="reference" type="text">
+                <el-button slot="reference" size="mini" type="text">
                   撤回
                 </el-button>
               </el-popconfirm>
             ) : null}
-            <el-button type="text" onClick={() => this.toDetail(row)}>
+            <el-button type="text" size="mini" onClick={() => this.toDetail(row)}>
               详情
             </el-button>
 
             {row.examineStatus === statusData['OK'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
-              <el-button type="text" onClick={() => this.toReturn(row)}>
+              <el-button type="text" size="mini" onClick={() => this.toReturn(row)}>
                 退订
               </el-button>
             ) : null}
             {row.examineStatus === statusData['SAVE'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
               <el-popconfirm title="确定关闭吗？" onOnConfirm={() => this.handleClose(row.id)}>
-                <el-button slot="reference" type="text">
+                <el-button slot="reference" type="text" size="mini">
                   关闭
                 </el-button>
               </el-popconfirm>

src/views/supply/price/difference_modify_list.vue

@@ -100,7 +100,7 @@ export default {
             {
               name: '',
               render: this.importButton(productUpdPriceMaterialImport, '导入', {
-                billType: 'GENERAL'
+                billType: 'DIFF'
               })
             }
           ]

src/views/supply/price/modify_list.vue

@@ -99,7 +99,7 @@ export default {
             {
               name: '',
               render: this.importButton(productUpdPriceMaterialImport, '导入', {
-                billType: 'GENERAL'
+                billType: 'HOME'
               })
             }
           ]

src/views/supply/retail/retail_list.vue

@@ -7,10 +7,9 @@
     :optionsEvensGroup="optionsEvensGroup"
     :columnParsing="columnParsing"
     :operationColumnWidth="200"
-
   >
+    <EditDateDialog :isShow.sync="isShowEditDateDialog" :dateForm.sync="dateForm" @submit="submitDateForm" />
     <Popu v-if="isShowDetail || isShowForm || isShowExamine || isShowReturn">
-      <EditDateDialog :isShow.sync="isShowEditDateDialog" :dateForm.sync="dateForm" />
       <RetailDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
       <RetailForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
       <RetailExamine :listItem="queryItem" v-if="isShowExamine" @backListFormDetail="backList" />
@@ -127,6 +126,26 @@ export default {
     exportList: exportRetaillListV2,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+      if (item.colName === 'the_time') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div class="dateClass">
+              <span>{row.theTime}</span>
+              {this.$checkBtnRole('date', this.$route.meta.roles) ? (
+                <el-button
+                  type="text"
+                  icon="el-icon-edit"
+                  style="padding: 0; margin-left: 6px"
+                  onClick={() => this.editDate(row)}
+                />
+              ) : (
+                ''
+              )}
+            </div>
+          )
+        }
+      }
+
       return defaultData
     },
     // 监听勾选变化

src/views/supply/sales/components/sales_detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" :content="!edit ? '详情' : '编辑'"></el-page-header>
+    <el-page-header :content="!edit ? '详情' : '编辑'" @back="goBack" />
 
     <div id="printMe">
       <div class="main-title">
@@ -32,35 +32,53 @@
           </el-col>
           <el-col :span="8" class="item">
             <div class="label">仓库</div>
-            <div class="value">{{ detailData.correspondName }}</div>
+            <div class="value">
+              <el-select
+                v-model="detailData.correspondId"
+                style="width: 100%"
+                placeholder="请选择仓库"
+                size="mini"
+                filterable
+                clearable
+                :disabled="!edit"
+                @change="handleStorkChange"
+              >
+                <el-option
+                  v-for="(item, index) in warehouseList"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id"
+                />
+              </el-select>
+            </div>
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">备注</div>
             <div class="value">
-              <el-input v-model="detailData.remark" :readonly="!edit" placeholder="请输入备注"></el-input>
+              <el-input v-model="detailData.remark" :readonly="!edit" placeholder="请输入备注" />
             </div>
           </el-col>
           <el-col :span="24" class="item file" style="width: 100%; height: auto">
             <div class="label" style="height: 140px">附件</div>
             <div class="value" style="height: 140px">
-              <div class="file-list" v-if="edit">
+              <div v-if="edit" class="file-list">
                 <ImageUpload :file-list="fileList" multiple />
               </div>
 
-              <div class="file-list" v-else>
-                <div class="file-item" v-for="item in detailData.salesOrderPictures">
+              <div v-else class="file-list">
+                <div v-for="item in detailData.salesOrderPictures" :key="item.fileUrl" class="file-item">
                   <el-image
                     v-if="checkFileType(item.fileUrl) == 'image'"
                     class="img"
                     fit="fill"
                     :src="$imageUrl + item.fileUrl"
                     :preview-src-list="[$imageUrl + item.fileUrl]"
-                  ></el-image>
+                  />
                   <div v-else class="box2" @click="openLink(item.fileUrl)">
-                    <img src="@/assets/common/word.png" v-if="checkFileType(item.fileUrl) == 'word'" />
-                    <img src="@/assets/common/excel.png" v-if="checkFileType(item.fileUrl) == 'excel'" />
-                    <img src="@/assets/common/ppt.png" v-if="checkFileType(item.fileUrl) == 'ppt'" />
-                    <img src="@/assets/common/pdf.png" v-if="checkFileType(item.fileUrl) == 'pdf'" />
+                    <img v-if="checkFileType(item.fileUrl) == 'word'" src="@/assets/common/word.png">
+                    <img v-if="checkFileType(item.fileUrl) == 'excel'" src="@/assets/common/excel.png">
+                    <img v-if="checkFileType(item.fileUrl) == 'ppt'" src="@/assets/common/ppt.png">
+                    <img v-if="checkFileType(item.fileUrl) == 'pdf'" src="@/assets/common/pdf.png">
                     <div class="name ellipsis-3">{{ item.fileName }}</div>
                   </div>
                 </div>
@@ -91,14 +109,14 @@
           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 align="center" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
             <template slot-scope="scope">
               {{
                 scope.row.orderType === 'TRADE' ||
-                scope.row.orderType === 'HOME' ||
-                scope.row.orderType === 'REQUISITION_TRADE' ||
-                scope.row.orderType === 'REQUISITION_HOME'
+                  scope.row.orderType === 'HOME' ||
+                  scope.row.orderType === 'REQUISITION_TRADE' ||
+                  scope.row.orderType === 'REQUISITION_HOME'
                   ? scope.row.enginOrderNo
                   : scope.row.mainOrderId
               }}
@@ -110,44 +128,44 @@
             prop="materialCode"
             min-width="120"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="产品编码"
             prop="materialOldNumber"
             min-width="120"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="产品名称"
             prop="materialName"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="规格型号"
             prop="specification"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="center"
             label="单位"
             prop="unit"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               <template v-if="edit">
                 <el-input
+                  v-model="scope.row.refundableQty"
                   size="mini"
                   class="input"
-                  v-model="scope.row.refundableQty"
                   placeholder="请输入数量"
-                ></el-input>
+                />
               </template>
               <template v-else>
                 {{ scope.row.refundableQty }}
@@ -168,11 +186,11 @@
             <template slot-scope="scope">
               <template v-if="edit">
                 <el-input
+                  v-model="scope.row.headerRemark"
                   size="mini"
                   class="input"
-                  v-model="scope.row.headerRemark"
                   placeholder="请输入表头备注"
-                ></el-input>
+                />
               </template>
               <template v-else>
                 {{ scope.row.headerRemark }}
@@ -184,11 +202,11 @@
             <template slot-scope="scope">
               <template v-if="edit">
                 <el-input
+                  v-model="scope.row.invoiceRemark"
                   size="mini"
                   class="input"
-                  v-model="scope.row.invoiceRemark"
                   placeholder="请输表体备注"
-                ></el-input>
+                />
               </template>
               <template v-else>
                 {{ scope.row.invoiceRemark }}
@@ -202,7 +220,7 @@
             prop="k3ServiceName"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          />
 
           <el-table-column
             align="left"
@@ -210,7 +228,7 @@
             prop="serviceName"
             min-width="100"
             show-overflow-tooltip
-          ></el-table-column>
+          />
           <el-table-column
             align="left"
             label="打印时间"
@@ -218,7 +236,7 @@
             min-width="100"
             show-overflow-tooltip
             sortable
-          ></el-table-column>
+          />
           <el-table-column
             align="left"
             label="打印状态"
@@ -265,7 +283,7 @@
       </div>
     </div>
 
-    <div style="margin: 10px" v-if="edit">
+    <div v-if="edit" style="margin: 10px">
       <el-button type="primary" @click="updateNum">保存</el-button>
     </div>
   </div>
@@ -273,16 +291,15 @@
 
 <script>
 import print from 'vue-print-nb'
+import { getWarehouseList } from '@/api/supply/apply'
 import { getDetail, updateNum } from '@/api/supply/sales'
 import { getFileUrl } from '@/api/common'
 import fileUpload from '@/components/Common/file-upload.vue'
 import ImageUpload from '@/components/Common/image-upload.vue'
 
-
 export default {
   name: 'SalesDetail',
   componentName: 'SalesDetail',
-  props: ['listItem', 'edit'],
   components: {
     fileUpload,
     ImageUpload
@@ -298,10 +315,11 @@ export default {
         { label: '审核通过', value: 'OK' }
         // { label: '审核驳回', value: 'FAIL' },,
       ]
-      let obj = statusList.find(o => o.value == val)
+      const obj = statusList.find(o => o.value == val)
       return obj ? obj.label : ''
     }
   },
+  props: ['listItem', 'edit'],
   data() {
     return {
       printObj: {
@@ -310,11 +328,13 @@ export default {
       detailData: {},
       srcList: [],
       fileList: [],
+      warehouseList: []
     }
   },
 
   created() {
     this.getDetail()
+    this.getWarehouseList()
   },
 
   methods: {
@@ -322,6 +342,22 @@ export default {
     goBack() {
       this.$emit('close')
     },
+    // 获取仓库列表
+    getWarehouseList() {
+      getWarehouseList({
+        pageNum: 1,
+        pageSize: -1
+      }).then(res => {
+        this.warehouseList = res.data.records
+      })
+    },
+    handleStorkChange(e) {
+      if (e) {
+        this.detailData.correspondName = this.warehouseList.find(k => k.id === e).name
+      } else {
+        this.detailData.correspondName = ''
+      }
+    },
     updateNum() {
       this.detailData.saleOrderData.forEach(item => {
         item.remark = item.invoiceRemark
@@ -329,17 +365,17 @@ export default {
       })
       const salesOrderPictures = []
       if (this.fileList.length) {
-            this.fileList.forEach(k => {
-              salesOrderPictures.push({
-                fileName: k.name,
-                fileUrl: k.url,
-                salesId: this.detailData.id 
-              })
-            })
-          }
+        this.fileList.forEach(k => {
+          salesOrderPictures.push({
+            fileName: k.name,
+            fileUrl: k.url,
+            salesId: this.detailData.id
+          })
+        })
+      }
       updateNum({
         ...this.detailData,
-        salesOrderPictures:salesOrderPictures
+        salesOrderPictures: salesOrderPictures
       }).then(res => {
         this.$successMsg('修改成功')
         this.goBack()
@@ -381,17 +417,15 @@ export default {
             item.sums2 = ['payAmount', 'price']
           })
         }
-        console.log(res.data);
-        res.data.salesOrderPictures.forEach(k=>{
+        console.log(res.data)
+        res.data.salesOrderPictures.forEach(k => {
           this.fileList.push({
-              hover: '',
-              url:k.fileUrl,
-              name:k.fileName,
-            })
-        this.srcList.push(this.$imageUrl+k.fileUrl)
-
+            hover: '',
+            url: k.fileUrl,
+            name: k.fileName
+          })
+          this.srcList.push(this.$imageUrl + k.fileUrl)
         })
-        
 
         this.detailData = res.data
         // this.srcList = [this.$imageUrl + this.detailData.fileUrl]