【修改】bug

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -86,7 +86,7 @@
               <div class="label">使用单位</div>
               <div class="value">{{ details.refUseUnit }}</div>
             </el-col>
-<el-col :xs="24" :sm="24" :lg="12" class="item">
+            <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">厂编号</div>
               <div class="value">{{ details.refFactoryNo }}</div>
             </el-col>

src/views/supply/apply/apply_list.vue

@@ -56,9 +56,21 @@
                 <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
               </el-form-item>
             </el-col>
+           <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表头业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
+              <el-form-item label="表体业务员" prop="serviceId">
+                <el-select v-model="screenForm.serviceId" placeholder="选择表体业务员" size="small" clearable filterable style="width: 100%">
                   <el-option
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
@@ -86,7 +98,7 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -347,6 +359,8 @@ export default {
         salesMan: '',
         orderType: '',
         mainOrderId: '',
+        k3ServiceId:'',
+        serviceId:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -389,7 +403,8 @@ export default {
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
-        serviceId: this.screenForm.salesMan,
+         k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
       }
@@ -444,6 +459,8 @@ export default {
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
         type: this.screenForm.orderType,
+         k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
         mainOrderId: this.screenForm.mainOrderId,
       };
       getApplyList(params).then((res) => {

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

@@ -615,8 +615,8 @@
 
           <el-table-column
             align="left"
-            label="备注"
-            prop="remark"
+            label="表体备注"
+            prop="itemRemark"
             min-width="160"
             show-overflow-tooltip
           />

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

@@ -246,8 +246,8 @@
             />
         <el-table-column
           align="center"
-          label="备注"
-          prop="remark"
+          label="表体备注"
+          prop="itemRemark"
           min-width="160"
           show-overflow-tooltip
         ></el-table-column>

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

@@ -358,12 +358,12 @@
         </el-table-column> -->
         <el-table-column
           align="left"
-          label="表头备注"
-          prop="remark"
+          label="表体备注"
+          prop="itemRemark"
           min-width="160"
         >
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" size="small" />
+            <el-input v-model="scope.row.itemRemark" size="small" />
           </template>
         </el-table-column>
         <el-table-column

src/views/supply/policy/policy_list.vue

@@ -145,7 +145,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="12" class="tr">
+            <el-col :xs="24" :sm="24" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button
                   size="mini"
@@ -408,7 +408,7 @@
               min-width="100"
               show-overflow-tooltip
             />
-              <el-table-column align="left" label="备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
+              <el-table-column align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column
               align="left"
@@ -488,7 +488,7 @@
                   type="text"
                   @click="toExamine(scope.row)"
                 >审核</el-button>
-                <el-popconfirm v-if="$checkBtnRole('delete', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.id)">
+                <el-popconfirm v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" style="margin-left: 10px;" title="确定删除吗？" @onConfirm="handleDelete(scope.row.id)">
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
                 <el-button
@@ -538,6 +538,7 @@
                 >
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
+
               </template>
             </el-table-column>
           </el-table>

src/views/supply/reserve/components/reserve_form.vue

@@ -152,7 +152,7 @@
               :remote-method="(e)=>checkMaterialList(e,2)"
               @change="changeDealer(scope.$index)">
               <el-option
-                v-for="item in dealerList"
+                v-for="item in materialList"
                 :key="item.number"
                 :label="item.number"
                 :value="item.number">
@@ -597,6 +597,8 @@ export default {
     checkDealerList(query,type) {
 
       checkDealerList({
+        pageNum:1,
+        pageSize:100,
         number:type==1 ? query :'',
         name:type ==2 ? query :'',
 
@@ -620,8 +622,10 @@ export default {
     // 查询产品
     checkMaterialList(query,type) {
       checkMaterialList({
+        pageNum:1,
+        pageSize:100,
         number: type ==1 ?query:'',
-         specification:type ==2 ?query:''
+        specification:type ==2 ?query:''
       }).then(res => {
         this.materialList = res.data || [];
       })

src/views/supply/retail/retail_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
@@ -64,7 +64,7 @@
                 <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6">
+            <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
                 <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
@@ -75,9 +75,32 @@
                   </el-option>
                 </el-select>
               </el-form-item>
+            </el-col> -->
+   <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表头业务员" prop="k3ServiceId">
+                <el-select v-model="screenForm.k3ServiceId" placeholder="选择表头业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="serviceId">
+                <el-select v-model="screenForm.serviceId" placeholder="选择表体业务员" size="small" clearable filterable style="width: 100%">
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -99,11 +122,11 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
@@ -212,61 +235,61 @@
             <el-table-column align="left" label="审核日期" prop="examineTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="220" fixed="right">
               <template slot-scope="scope">
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定申请吗？" 
-                  @onConfirm="handleSubmit(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定申请吗？"
+                  @onConfirm="handleSubmit(scope.row.id)"
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text">申请</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定撤回吗？" 
-                  @onConfirm="handleWithdraw(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定撤回吗？"
+                  @onConfirm="handleWithdraw(scope.row.id)"
                   v-if="$checkBtnRole('apply', $route.meta.roles) && scope.row.examineStatus === 'WAIT'" >
                   <el-button slot="reference" type="text">撤回</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定弃审吗？" 
-                  @onConfirm="handleAbandon(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定弃审吗？"
+                  @onConfirm="handleAbandon(scope.row.id)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定关闭吗？" 
-                  @onConfirm="handleClose(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定关闭吗？"
+                  @onConfirm="handleClose(scope.row.id)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && !scope.row.closeTime && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'WAIT')" >
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-right: 10px;" 
-                  title="确定删除吗？" 
-                  @onConfirm="handleDelete(scope.row.id)" 
+                <el-popconfirm
+                  style="margin-right: 10px;"
+                  title="确定删除吗？"
+                  @onConfirm="handleDelete(scope.row.id)"
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
                   <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
                 </el-popconfirm>
-                <el-button 
-                  type="text" 
-                  @click="toExamine(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toExamine(scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'WAIT'">
                   审批
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toForm(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toForm(scope.row)"
                   v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">
                   编辑
                 </el-button>
-                <el-button 
-                  type="text" 
-                  @click="toReturn(scope.row)" 
+                <el-button
+                  type="text"
+                  @click="toReturn(scope.row)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'">
                   退订
                 </el-button>
-                <el-button 
-                  type="text" 
+                <el-button
+                  type="text"
                   @click="toDetail(scope.row)">
                   详情
                 </el-button>
@@ -342,6 +365,8 @@ export default {
         shMan: '',
         salesMan: '',
         status: '',
+        k3ServiceId:'',
+        serviceId:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -378,7 +403,9 @@ export default {
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
         isDirectTransfer: this.screenForm.isDirectTransfer,
-        serviceId: this.screenForm.salesMan,
+
+        k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
         type: 1, // 1:普通零售单，2:政策零售单
       }
     },
@@ -423,7 +450,8 @@ export default {
         createBy: this.screenForm.zbMan,
         examineBy: this.screenForm.shMan,
         isDirectTransfer: this.screenForm.isDirectTransfer,
-        serviceId: this.screenForm.salesMan,
+        k3ServiceId:this.screenForm.k3ServiceId,
+        serviceId:this.screenForm.serviceId,
         type: 1, // 1:普通零售单，2:政策零售单
       };
       getList(params).then((res) => {