物料详情添加字段，政策订单列表添加业务员，

src/views/basic_data/material/components/material_list-detail.vue

@@ -483,86 +483,6 @@
           </div>
         </div>
         <div>
-          <div class="base-header">
-            <span>客机信息</span>
-          </div>
-
-          <br />
-          <el-table
-            v-loading="listLoading"
-            :data="detail.items"
-            element-loading-text="Loading"
-            :header-cell-style="{
-              'background-color': '#e8e8e8',
-              color: 'black',
-            }"
-            border=""
-          >
-            <el-table-column
-              align="center"
-              label="序号"
-              prop="id"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="内机编码"
-              prop="innerMachineNumber"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="内机名称"
-              prop="innerMachineName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="型号"
-              prop="orgNumber"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="内机体积"
-              prop="innerMachineVolume"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="外机编码"
-              prop="outsideMachineNumber"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="外机名称"
-              prop="outsideMachineName"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="型号"
-              prop="outsideMachineType"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-            <el-table-column
-              align="center"
-              label="外机体积"
-              prop="outsideMachineVolume"
-              min-width="160"
-              show-overflow-tooltip
-            ></el-table-column>
-          </el-table>
-          <br />
           <el-row>
             <el-col :span="6">
               <el-form-item label="商城分类" size="small">
@@ -571,7 +491,133 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="内机代码" size="small">
+                <el-input readonly v-model="detail.njdmText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="内机代码" size="small">
+                <el-input readonly v-model="detail.njdmText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="内机型号" size="small">
+                <el-input readonly v-model="detail.njxhText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="配件厂产品代码" size="small">
+                <el-input readonly v-model="detail.pjcspdmText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="配件代码" size="small">
+                <el-input readonly v-model="detail.pjdmText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="配件型号1" size="small">
+                <el-input readonly v-model="detail.pjxh1Text"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="条码头" size="small">
+                <el-input readonly v-model="detail.tmtText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="外机代码" size="small">
+                <el-input readonly v-model="detail.wjdmText"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="外机型号" size="small">
+                <el-input readonly v-model="detail.wjxhText"></el-input>
+              </el-form-item>
+            </el-col>
           </el-row>
+<!--          <div class="base-header">-->
+<!--            <span>客机信息</span>-->
+<!--          </div>-->
+
+<!--          <br />-->
+<!--          <el-table-->
+<!--            v-loading="listLoading"-->
+<!--            :data="detail.items"-->
+<!--            element-loading-text="Loading"-->
+<!--            :header-cell-style="{-->
+<!--              'background-color': '#e8e8e8',-->
+<!--              color: 'black',-->
+<!--            }"-->
+<!--            border=""-->
+<!--          >-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="序号"-->
+<!--              prop="id"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="内机编码"-->
+<!--              prop="innerMachineNumber"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="内机名称"-->
+<!--              prop="innerMachineName"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="型号"-->
+<!--              prop="orgNumber"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="内机体积"-->
+<!--              prop="innerMachineVolume"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="外机编码"-->
+<!--              prop="outsideMachineNumber"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="外机名称"-->
+<!--              prop="outsideMachineName"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="型号"-->
+<!--              prop="outsideMachineType"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="外机体积"-->
+<!--              prop="outsideMachineVolume"-->
+<!--              min-width="160"-->
+<!--              show-overflow-tooltip-->
+<!--            ></el-table-column>-->
+<!--          </el-table>-->
+<!--          <br />-->
+
           <div>
             <div class="img">
               <strong>产品图片</strong>
@@ -622,9 +668,7 @@
 </template>
 
 <script>
-import {
- editCategory
-} from "@/api/basic_data/material";
+import { editCategory } from '@/api/basic_data/material'
 
 export default {
   props: {

src/views/basic_data/material/material_list.vue

@@ -111,19 +111,19 @@
               prop="maintainData"
               min-width="100"
             />
-            <el-table-column
-              align="center"
-              label="是否维护内外机档案"
-              prop="maintainFiles"
-              min-width="100"
-            >
-              <template slot-scope="scope">
-                <el-tag v-if="scope.row.isSheath == true" type="success"
-                  >是</el-tag
-                >
-                <el-tag v-else type="danger">否</el-tag>
-              </template>
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              align="center"-->
+<!--              label="是否维护内外机档案"-->
+<!--              prop="maintainFiles"-->
+<!--              min-width="100"-->
+<!--            >-->
+<!--              <template slot-scope="scope">-->
+<!--                <el-tag v-if="scope.row.isSheath == true" type="success"-->
+<!--                  >是</el-tag-->
+<!--                >-->
+<!--                <el-tag v-else type="danger">否</el-tag>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column
               align="center"
               label="基本单位"
@@ -174,9 +174,9 @@
 </template>
 
 <script>
-import Mixin from "@/mixin/index";
-import { getMaterialDetail, getMaterialList } from "@/api/basic_data/material";
-import MaterialListDetail from "./components/material_list-detail.vue";
+import Mixin from '@/mixin/index'
+import { getMaterialDetail, getMaterialList } from '@/api/basic_data/material'
+import MaterialListDetail from './components/material_list-detail.vue'
 
 export default {
   components: { MaterialListDetail },

src/views/basic_data/warehouse/warehouse_book.vue

@@ -204,6 +204,7 @@ export default {
             ...this.ruleForm
           }).then(res => {
             this.$successMsg('新增成功')
+              this.getList()
           })
         } else {
           console.log('error submit!!')

src/views/engin_deposit/deposit_list.vue

@@ -88,6 +88,7 @@
           >导出</el-button
         >
         <el-upload
+          v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
           :action="baseURL + 'student/import'"
           :http-request="handleImport"

src/views/sales_policy/components/editPolicy.vue

@@ -803,7 +803,6 @@ export default {
               k.specification = k.materialId
             }
 
-
             k.walletRelaList.forEach((l) => {
               l.id = l.walletId
               l.name = l.walletName

src/views/supply/policy/policy_list.vue

@@ -98,8 +98,19 @@
                 />
               </el-form-item>
             </el-col>
-
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="业务员" prop="salesMan">
+                <el-select v-model="screenForm.salesMan" 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="24" class="tr">
               <el-form-item label="">
                 <el-button
                   size="small"
@@ -497,6 +508,7 @@ import RetailForm from './components/retail_form'
 import RetailExamine from './components/retail_examine'
 import RetailReturn from './components/retail_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
+import { getSalesmanList } from '@/api/common'
 
 let that
 export default {
@@ -529,7 +541,8 @@ export default {
         date: '',
         zbMan: '',
         shMan: '',
-        status: ''
+        status: '',
+        salesMan:''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -545,7 +558,8 @@ export default {
       isShowEditDateDialog: false,
       dateForm: {
         date: ''
-      }
+      },
+      salesmanList:[]
     }
   },
   computed: {
@@ -571,9 +585,22 @@ export default {
 
   created() {
     this.getList()
+    this.getSalesmanList();
   },
 
   methods: {
+    // 获取业务员列表
+    getSalesmanList() {
+      getSalesmanList({
+        pageNum: 1,
+        pageSize: -1,
+        isCustomer: 0,
+        status: true,
+      }).then(res => {
+        this.salesmanList = res.data.records;
+      })
+    },
+
     // 查询按钮权限
     checkBtnRole(value) {
       // let btnRole = this.$route.meta.roles;
@@ -603,6 +630,7 @@ export default {
         createBy: this.screenForm.zbMan,
         status: true,
         examineBy: this.screenForm.shMan,
+        serviceId:this.screenForm.salesMan,
         type: 2 // 1:普通零售单，2:政策零售单
       }
       getList(params).then((res) => {