【修改】调整

src/api/supply/engin.js

@@ -476,3 +476,21 @@ export function getWalletList(params) {
     params
   })
 }
+
+// 打开/关闭信息单
+export function setOrderIsClose(params) {
+  return request({
+    url: '/engin-info-order/close/update',
+    method: 'post',
+    params
+  })
+}
+
+// 信息货品删除
+export function delItem(params) {
+  return request({
+    url: '/engin-info-order/del-item',
+    method: 'post',
+    params
+  })
+}

src/views/finance/components/rebate_list-confirm.vue

@@ -108,10 +108,24 @@
           <!--              ></el-input>-->
           <!--            </template>-->
           <!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            align="left"-->
+<!--            label="备注"-->
+<!--            prop="policyDocNo"-->
+<!--            min-width="160"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
           <el-table-column
             align="left"
-            label="备注"
-            prop="policyDocNo"
+            label="备注1"
+            prop="remark1"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="left"
+            label="备注2"
+            prop="remark2"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -190,7 +204,7 @@ export default {
           case '[object Number]':
             return Number(data.toString())
           case '[object Boolean]':
-            return new Boolean(data.toString())
+            return Boolean(data.toString())
           case '[object Date]':
             return new Date(data.getTime())
           case '[object Array]':

src/views/finance/rebate_list.vue

@@ -69,6 +69,12 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="备注1" prop="id">
+                    <el-input v-model="searchForm.remark1" placeholder="请输入备注1"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="商家已确认" prop="isConfirm">
                     <el-radio-group v-model="searchForm.isConfirm">
                       <el-radio-button label="">全部</el-radio-button>
@@ -615,7 +621,8 @@ export default {
         startTime: '',
         endTime: '',
         examineStatus: '',
-        isConfirm: ''
+        isConfirm: '',
+        remark1:''
       }, //搜索表单
       listLoading: false, // 列表加载loading
       showPage: 1,
@@ -758,6 +765,7 @@ export default {
         customerName: this.searchForm.customerName,
         customerNumber: this.searchForm.customerNumber,
         endTime: this.searchForm.endTime,
+        remark1: this.searchForm.remark1,
         examineStatus: this.searchForm.examineStatus,
         id: this.searchForm.id,
         isConfirm: this.searchForm.isConfirm,

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

@@ -5,7 +5,7 @@
 
       <div id="printData">
         <div class="main-title">
-          <div class="title">工程订单</div>
+          <div class="title">工程订单 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
         </div>
 
         <div class="diy-table-1">

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

@@ -3,7 +3,7 @@
     <el-page-header content="审批" @back="goBack" />
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">工程订单 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

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

@@ -3,7 +3,7 @@
     <el-page-header content="退订" @back="goBack" />
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">工程订单 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

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

@@ -246,14 +246,15 @@
 
     <div class="page-footer">
       <div class="footer">
-        <el-button type="primary">启用</el-button>
-        <el-button type="primary">关单</el-button>
+        <el-button type="primary" :disabled="!listItem.isClose" @click="setOrderIsClose(false)">启用</el-button>
+        <el-button type="primary" :disabled="listItem.isClose" @click="setOrderIsClose(true)">关单</el-button>
         <el-button
           type="primary"
           @click="overData"
           v-if="!isDealer"
           :disabled="detailData.examineStatus !== 'OK' || detailData.directTransferStatus"
-          >直调完结</el-button
+        >直调完结
+        </el-button
         >
         <el-button @click="goBack">返回列表</el-button>
       </div>
@@ -262,8 +263,9 @@
 </template>
 
 <script>
-import { getEnginDetail, overEngin } from '@/api/supply/engin'
+import { getEnginDetail, overEngin, setOrderIsClose } from '@/api/supply/engin'
 import { mapGetters } from 'vuex'
+
 export default {
   name: 'EnginDetail',
   componentName: 'EnginDetail',
@@ -319,7 +321,17 @@ export default {
         this.detailData = res.data
       })
     },
-
+    // 打开/关闭信息单
+    setOrderIsClose(status) {
+      setOrderIsClose({
+        enginInfoId: this.detailData.enginInfoId,
+        isClose: status
+      }).then(res => {
+        this.$successMsg(status ? '关闭' : '启用')
+        this.goBack()
+        this.$parent.getList()
+      })
+    },
     // 直调完结
     overData() {
       this.$confirm('此操作将直调完结订单, 是否继续?', '提示', {
@@ -333,7 +345,8 @@ export default {
             this.getDetail()
           })
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     }
   }
 }
@@ -344,6 +357,7 @@ export default {
   width: 100%;
   height: 100%;
 }
+
 .main-title {
   display: flex;
   justify-content: space-between;
@@ -352,6 +366,7 @@ export default {
   height: 60px;
   border-bottom: 1px solid #dcdfe6;
   margin-bottom: 20px;
+
   .title {
     font-size: 16px;
     font-weight: 600;

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

@@ -313,7 +313,7 @@
         <el-table-column align="center" label="税率" prop="taxRate" min-width="100" show-overflow-tooltip />
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" @click="deleteItem(scope.$index, scope.row.cid)">删除</el-button>
+            <el-button type="text" @click="deleteItem(scope.$index, scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -450,7 +450,7 @@
 </template>
 
 <script>
-import { getEnginDetail, getRetailProductList, addEngin, editEngin, submitEngin } from '@/api/supply/engin'
+import { getEnginDetail, getRetailProductList, addEngin, editEngin, submitEngin, delItem } from '@/api/supply/engin'
 import { getDictList, getTypeList, getSalesmanList, getDealerList } from '@/api/common'
 
 export default {
@@ -852,11 +852,15 @@ export default {
     },
 
     // 删除产品
-    deleteItem(index, id) {
-      if (this.listItem && this.examineStatus === 'OK' && id) {
-        this.$errorMsg('已审核通过的型号不能删除')
-        return
-      }
+    deleteItem(index, row) {
+      // if (this.listItem && this.examineStatus === 'OK' && id) {
+      //   this.$errorMsg('已审核通过的型号不能删除')
+      //   return
+      // }
+      delItem({
+        enginInfoNo: row.enginInfoNo,
+        itemId: row.id
+      })
       this.goodsList.splice(index, 1)
     },
 
@@ -960,6 +964,7 @@ export default {
   width: 100%;
   height: 100%;
 }
+
 .main-title {
   display: flex;
   justify-content: space-between;
@@ -968,24 +973,29 @@ export default {
   height: 60px;
   border-bottom: 1px solid #dcdfe6;
   margin-bottom: 20px;
+
   .title {
     font-size: 16px;
     font-weight: 600;
     padding-left: 10px;
   }
 }
+
 .tables {
   display: flex;
   margin-top: 10px;
+
   .table {
     width: 45%;
   }
+
   .buttons {
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
     padding: 0 10px;
+
     button {
       margin: 0;
       margin-top: 10px;
@@ -997,6 +1007,7 @@ export default {
 ::v-deep input::-webkit-inner-spin-button {
   -webkit-appearance: none;
 }
+
 ::v-deep input[type='number'] {
   -moz-appearance: textfield;
 }

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

@@ -5,7 +5,7 @@
 
       <div id="printData">
         <div class="main-title">
-          <div class="title">工程订单</div>
+          <div class="title">工程订单 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
         </div>
 
         <div class="diy-table-1">

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

@@ -3,7 +3,7 @@
     <el-page-header content="审批" @back="goBack" />
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">工程订单 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

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

@@ -3,7 +3,7 @@
     <el-page-header @back="goBack" content="退订"></el-page-header>
 
     <div class="main-title">
-      <div class="title">工程订单</div>
+      <div class="title">工程订单 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

src/views/supply/engin/engin_list.vue

@@ -12,8 +12,9 @@
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                item.label
-              }}</el-radio-button>
+                  item.label
+                }}
+              </el-radio-button>
             </el-radio-group>
           </template>
           <template #search>
@@ -121,7 +122,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-              >新增</el-button
+            >新增
+            </el-button
             >
           </div>
           <div class="fr">
@@ -376,6 +378,18 @@
               min-width="160"
               show-overflow-tooltip
             />
+            <el-table-column
+              align="left"
+              label="状态"
+              sortable
+              prop="isClose"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template v-slot="{row}">
+                {{ row.isClose ? '闭关' : '启用' }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="操作" width="210" fixed="right">
               <template slot-scope="scope">
                 <el-popconfirm
@@ -419,7 +433,7 @@
                 >
                   审批
                 </el-button>
-                <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
+                <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <el-popconfirm
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px"
@@ -608,6 +622,7 @@ export default {
       this.listLoading = true
 
       const params = {
+        isClose: true,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         enginInfoNo: this.screenForm.orderNum,

src/views/supply/implement/implement_total_list.vue

@@ -178,7 +178,8 @@
                   style="cursor: pointer"
                   @click="openDisplaceDetail(scope.row)"
                   v-if="scope.row.isDisplaceOrder"
-                  >置换</el-tag
+                >置换
+                </el-tag
                 >
                 <el-tag type="success" size="mini" v-if="scope.row.directTransferStatusName !== '非直调'">直调</el-tag>
               </template>
@@ -235,6 +236,13 @@
               min-width="100"
               show-overflow-tooltip
             ></el-table-column>
+            <el-table-column
+              align="left"
+              label="金蝶部门"
+              prop="k3OrgName"
+              min-width="100"
+              show-overflow-tooltip
+            ></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />

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

@@ -14,7 +14,7 @@
       </div>
 
       <div class="main-title">
-        <div class="title">订单信息</div>
+        <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
       </div>
 
       <div class="diy-table-1">

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

@@ -3,7 +3,7 @@
     <el-page-header @back="goBack" content="审批"></el-page-header>
 
     <div class="main-title">
-      <div class="title">订单信息</div>
+      <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

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

@@ -3,7 +3,7 @@
     <el-page-header @back="goBack" content="退订"></el-page-header>
 
     <div class="main-title">
-      <div class="title">订单信息</div>
+      <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

src/views/supply/retail/components/retail_detail.vue

@@ -15,7 +15,7 @@
       </div>
 
       <div class="main-title">
-        <div class="title">订单信息</div>
+        <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
       </div>
 
       <div class="diy-table-1">

src/views/supply/retail/components/retail_examine.vue

@@ -3,7 +3,7 @@
     <el-page-header @back="goBack" content="审批"></el-page-header>
 
     <div class="main-title">
-      <div class="title">订单信息</div>
+      <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

src/views/supply/retail/components/retail_return.vue

@@ -3,7 +3,7 @@
     <el-page-header @back="goBack" content="退订"></el-page-header>
 
     <div class="main-title">
-      <div class="title">订单信息</div>
+      <div class="title">订单信息 <span style="margin-left: 20px">经销商名称：{{detailData.customerName}}</span></div>
     </div>
 
     <div class="diy-table-1">

src/views/supply/sales/sales_list.vue

@@ -710,7 +710,7 @@ export default {
     updateReceipt() {
       if (!this.value1) {
         this.$errorMsg('请选择时间')
-        return
+
       }
       // updateReceipt({
       // startTime:this.value1[0],