Merge branch 'feature/Feature-sales' into develop

src/api/basic_data/material.js

@@ -288,3 +288,12 @@ export function getProductCategoryDelSub(params) {
   })
 }
 
+
+// 业务员
+export function getUserList(params) {
+  return request({
+    url:'/admin/user/list',
+    method: 'get',
+    params
+  })
+}

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

@@ -1,554 +1,580 @@
 <template>
   <div>
-    <div class="sty">
-      <el-page-header @back="goBack" content="详情页面"> </el-page-header>
-    </div>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>信息</span>
+    <el-form label-width="120px" size="small">
+      <div class="sty">
+        <el-page-header @back="goBack" content="详情页面"> </el-page-header>
       </div>
-      <el-row>
-        <el-col :span="8"><span>创建组织</span><input type="text" v-model="detail.updateBy" /></el-col>
-        <el-col :span="8"><span>使用组织</span><input type="text" v-model="detail.useOrgId" /></el-col>
-        <el-col :span="8"><span>编码</span><input type="text"  v-model="detail.useOrgNumber"/></el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8"><span>名称</span><input type="text" v-model="detail.useOrgName"/></el-col>
-        <el-col :span="8"></el-col>
-        <el-col :span="8"></el-col>
-      </el-row>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>基本</span>
-      </div>
-      <div class="baseInfo">
-        <div>
-          <div class="base-header">
-            <span>基本信息</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">规格型号</span
-              >
-              <input type="text" v-model="detail.specification">
-              <!-- <select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select> -->
-              </el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">助记码</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">旧物料编码</span><input type="text" v-model="detail.number"/>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">条码</span><input type="text" />
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">描述</span
-              ><textarea
-                class="textareaStyle"
-                name=""
-                id=""
-                cols="30"
-                rows="10"
-              ></textarea>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">物料分组</span><input type="text" v-model="detail.materialGroupNumber"/>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">物料属性</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">配置生产</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>信息</span>
+        </div>
+        <el-row>
+          <el-col :xs="24" :sm="12" :lg="6"
             >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">特征件子项</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
+              <el-form-item label="创建组织" size="small">
+                <el-input v-model="detail.updateBy"  size="small"></el-input>
+              </el-form-item>
+           </el-col>
+          <el-col :xs="24" :sm="12" :lg="6"
             >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">套件</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
+             <el-form-item label="使用组织" size="small">
+                <el-input v-model="detail.useOrgId"  size="small"></el-input>
+              </el-form-item>
+
+           </el-col>
+          <el-col :xs="24" :sm="12" :lg="6"
             >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">基本单位</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">正常</option>
-              </select></el-col
+             <el-form-item label="编码" size="small">
+                <el-input v-model="detail.useOrgNumber"  size="small"></el-input>
+              </el-form-item>
+           </el-col>
+         <el-col :xs="24" :sm="12" :lg="6"
             >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">禁用原因</span><input type="text"
-            /></el-col>
-          </el-row>
+             <el-form-item label="名称" size="small">
+                <el-input v-model="detail.name"  size="small"></el-input>
+              </el-form-item>
+           </el-col>
+        </el-row>
+      </el-card>
+
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>基本</span>
         </div>
-        <div>
-          <div class="base-header">
-            <span>控制</span>
+        <div class="baseInfo">
+          <div>
+            <div class="base-header">
+              <span>基本信息</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">规格型号</span>
+                <input type="text" v-model="detail.specification" />
+                <!-- <select name="" id="" class="selectStyle2">
+                <option value="">普通仓库</option>
+              </select> -->
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">助记码</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">旧物料编码</span
+                ><input type="text" v-model="detail.number" />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">条码</span><input type="text" />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">描述</span
+                ><textarea
+                  class="textareaStyle"
+                  name=""
+                  id=""
+                  cols="30"
+                  rows="10"
+                ></textarea>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">物料分组</span
+                ><input type="text" v-model="detail.materialGroupNumber" />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">物料属性</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">配置生产</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">特征件子项</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">套件</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">基本单位</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">正常</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">禁用原因</span><input type="text"
+              /></el-col>
+            </el-row>
           </div>
-          <el-row>
-            <el-row></el-row>
+          <div>
+            <div class="base-header">
+              <span>控制</span>
+            </div>
+            <el-row>
+              <el-row></el-row>
+              <el-row>
+                <el-col :span="8"
+                  ><span class="marg-r">允许采购</span
+                  ><input type="checkbox" :checked="detail.isPurchase"
+                /></el-col>
+                <el-col :span="8"
+                  ><span class="marg-r">允许销售</span
+                  ><input type="checkbox" :checked="detail.isSale"
+                /></el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8"
+                  ><span class="marg-r">允许库存</span
+                  ><input type="checkbox" :checked="detail.isInventory"
+                /></el-col>
+                <el-col :span="8"
+                  ><span class="marg-r">允许生产</span><input type="checkbox"
+                /></el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8"
+                  ><span class="marg-r">允许委外</span><input type="checkbox"
+                /></el-col>
+                <el-col :span="8"
+                  ><span class="marg-r">允许资产</span><input type="checkbox"
+                /></el-col>
+              </el-row>
+            </el-row>
+
+            <div class="base-header">
+              <span>财务信息</span>
+            </div>
             <el-row>
-              <el-col :span="8"
-                ><span class="marg-r">允许采购</span><input type="checkbox"
-                  :checked="detail.isPurchase"
+              <el-col :span="24"
+                ><span class="marg-r">默认税率</span><input type="text"
               /></el-col>
-              <el-col :span="8"
-                ><span class="marg-r">允许销售</span><input type="checkbox"
-                  :checked="detail.isSale"
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">存货类别</span
+                ><input type="text" v-model="detail.categoryId"
               /></el-col>
             </el-row>
             <el-row>
-              <el-col :span="8"
-                ><span class="marg-r">允许库存</span><input type="checkbox"
-                 :checked="detail.isInventory"
+              <el-col :span="24"
+                ><span class="marg-r">税分类</span><input type="text"
               /></el-col>
-              <el-col :span="8"
-                ><span class="marg-r">允许生产</span><input type="checkbox"
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">结算成本价加减价比例(%)</span
+                ><input type="text"
               /></el-col>
             </el-row>
             <el-row>
-              <el-col :span="8"
-                ><span class="marg-r">允许委外</span><input type="checkbox"
+              <el-col :span="24"
+                ><span class="marg-r">商城公开价</span><input type="text"
               /></el-col>
-              <el-col :span="8"
-                ><span class="marg-r">允许资产</span><input type="checkbox"
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">套机码</span><input type="text"
               /></el-col>
             </el-row>
-          </el-row>
-
-          <div class="base-header">
-            <span>财务信息</span>
           </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">默认税率</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">存货类别</span><input type="text" v-model="detail.categoryId"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">税分类</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">结算成本价加减价比例(%)</span
-              ><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">商城公开价</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">套机码</span><input type="text"
-            /></el-col>
-          </el-row>
-        </div>
-        <div>
-          <div class="base-header">
-            <span>重量信息</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">毛重</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">净重</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">重量单位</span><input type="text"
-            /></el-col>
-          </el-row>
+          <div>
+            <div class="base-header">
+              <span>重量信息</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">毛重</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">净重</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">重量单位</span><input type="text"
+              /></el-col>
+            </el-row>
 
-          <div class="base-header">
-            <span>尺寸信息</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">长</span><input type="text" v-model="detail.length"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">宽</span><input type="text" v-model="detail.width"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">高</span><input type="text" v-model="detail.height"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">体积</span><input type="text"  v-dmole="detail.volume"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">尺寸单位</span><input type="text"
-            /></el-col>
-          </el-row>
+            <div class="base-header">
+              <span>尺寸信息</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">长</span
+                ><input type="text" v-model="detail.length"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">宽</span
+                ><input type="text" v-model="detail.width"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">高</span
+                ><input type="text" v-model="detail.height"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">体积</span
+                ><input type="text" v-dmole="detail.volume"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">尺寸单位</span><input type="text"
+              /></el-col>
+            </el-row>
 
-          <div class="base-header">
-            <span>状态</span>
+            <div class="base-header">
+              <span>状态</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">数据状态</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">禁用状态</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">已使用</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
           </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">数据状态</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">禁用状态</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">已使用</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
-            >
-          </el-row>
         </div>
-      </div>
-    </el-card>
-    <el-card class="box-card">
-      <div slot="header" class="clearfix">
-        <span>库存</span>
-      </div>
-      <div class="baseInfo">
-        <div>
-          <div class="base-header">
-            <span>存储</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">库存单位</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">换算方向</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">仓库</span><input type="text" />
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">仓位</span><input type="text" />
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">单箱标准数量</span><input type="text"
-            /></el-col>
-          </el-row>
-          <div class="base-header">
-            <span>库存控制</span>
-          </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r color">可锁库</span><input type="checkbox"
-            /></el-col>
-          </el-row>
+      </el-card>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>库存</span>
         </div>
-        <div>
-          <div class="base-header">
-            <span>管理</span>
+        <div class="baseInfo">
+          <div>
+            <div class="base-header">
+              <span>存储</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">库存单位</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">换算方向</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">仓库</span><input type="text" />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">仓位</span><input type="text" />
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">单箱标准数量</span
+                ><input type="text"
+              /></el-col>
+            </el-row>
+            <div class="base-header">
+              <span>库存控制</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r color">可锁库</span><input type="checkbox"
+              /></el-col>
+            </el-row>
           </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">启用批号管理</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">批号编码规则</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">启用保质期管理</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">批号附属信息</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">保质期单位</span
-              ><select name="" id="" class="selectStyle2">
-                <option value="">普通仓库</option>
-              </select></el-col
-            >
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">在架寿命期</span><input type="text"
-            /></el-col>
-          </el-row>
-          <div class="base-header">
-            <span>库存成本</span>
+          <div>
+            <div class="base-header">
+              <span>管理</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">启用批号管理</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">批号编码规则</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">启用保质期管理</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">批号附属信息</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">保质期单位</span
+                ><select name="" id="" class="selectStyle2">
+                  <option value="">普通仓库</option>
+                </select></el-col
+              >
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">在架寿命期</span><input type="text"
+              /></el-col>
+            </el-row>
+            <div class="base-header">
+              <span>库存成本</span>
+            </div>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">参考成本</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">成本单位</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">币别</span><input type="text"
+              /></el-col>
+            </el-row>
+          </div>
+          <div>
+            <div class="base-header">
+              <span>库存计划</span>
+            </div>
+            <el-row>
+              <el-col :span="24">
+                <span class="marg-r startUse">启用</span>
+                <div class="start">
+                  <div><input type="checkbox" /><span>最小库存预警</span></div>
+                  <div><input type="checkbox" /><span>安全库存预警</span></div>
+                  <div><input type="checkbox" /><span>最大库存预警</span></div>
+                  <div><input type="checkbox" /><span>在订货点预警</span></div>
+                </div>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">最小库存</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">再定货点</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">经济订货批量</span><input type="text"
+              /></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24"
+                ><span class="marg-r">最大库存</span><input type="text"
+              /></el-col>
+            </el-row>
           </div>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">参考成本</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">成本单位</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">币别</span><input type="text"
-            /></el-col>
-          </el-row>
         </div>
         <div>
           <div class="base-header">
-            <span>库存计划</span>
+            <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="24">
-              <span class="marg-r startUse">启用</span>
-              <div class="start">
-                <div><input type="checkbox" /><span>最小库存预警</span></div>
-                <div><input type="checkbox" /><span>安全库存预警</span></div>
-                <div><input type="checkbox" /><span>最大库存预警</span></div>
-                <div><input type="checkbox" /><span>在订货点预警</span></div>
-              </div>
+            <el-col :span="6">
+              <strong class="marg-r">商城分类</strong>
+              <select name="" id="" class="selectStyle2">
+                <option value="">挂式空调</option>
+              </select>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">最小库存</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">再定货点</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">经济订货批量</span><input type="text"
-            /></el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="24"
-              ><span class="marg-r">最大库存</span><input type="text"
-            /></el-col>
-          </el-row>
-        </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">
-            <strong class="marg-r">商城分类</strong>
-            <select name="" id="" class="selectStyle2">
-              <option value="">挂式空调</option>
-            </select>
-          </el-col>
-        </el-row>
-        <div>
-          <div class="img">
-            <strong>产品图片</strong>
+          <div>
+            <div class="img">
+              <strong>产品图片</strong>
+            </div>
+            <br />
+            <el-upload list-type="picture-card">
+              <i class="el-icon-plus"></i>
+            </el-upload>
+            <br />
+            <span>(上传图片大小规格: , 最多上传5张)</span>
+            <div class="img"></div>
           </div>
           <br />
-          <el-upload list-type="picture-card">
-            <i class="el-icon-plus"></i>
-          </el-upload>
-          <br />
-          <span>(上传图片大小规格: , 最多上传5张)</span>
-          <div class="img"></div>
-        </div>
-        <br />
-        <div>
-          <div class="img">
-            <strong>详情图</strong>
+          <div>
+            <div class="img">
+              <strong>详情图</strong>
+            </div>
+            <br />
+            <el-upload list-type="picture-card">
+              <i class="el-icon-plus"></i>
+            </el-upload>
+            <br />
+            <span>(上传图片宽度不超过: ,)</span>
+            <div class="img"></div>
           </div>
           <br />
-          <el-upload list-type="picture-card">
-            <i class="el-icon-plus"></i>
-          </el-upload>
+          <el-row>
+            <el-col :span="6">
+              <strong class="marg-r">是否允许订货</strong>
+              <select name="" id="" class="selectStyle2">
+                <option value="">是</option>
+                <option value="">否</option>
+              </select>
+            </el-col>
+          </el-row>
           <br />
-          <span>(上传图片宽度不超过: ,)</span>
-          <div class="img"></div>
+          <br />
+          <el-button type="info">保存</el-button>
         </div>
-        <br />
-        <el-row>
-          <el-col :span="6">
-            <strong class="marg-r">是否允许订货</strong>
-            <select name="" id="" class="selectStyle2">
-              <option value="">是</option>
-              <option value="">否</option>
-            </select>
-          </el-col>
-        </el-row>
-        <br />
-        <br />
-        <el-button type="info">保存</el-button>
-      </div>
-    </el-card>
+      </el-card>
+    </el-form>
   </div>
 </template>
 
 <script>
 export default {
-  props:{
-    detail:{
-      type:Object,
-      default:{}
-    }
+  props: {
+    detail: {
+      type: Object,
+      default: {},
+    },
   },
   created() {
-      console.log(this.detail);
+    console.log(this.detail);
   },
   methods: {
     goBack() {

src/views/basic_data/material/components/modify_list-apply.vue

@@ -15,55 +15,36 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据编号">
               <el-input
-                placeholder="请输入"
+                placeholder="系统自动生成"
                 disabled
                 v-model="base.billId"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价日期">
-              <el-date-picker
-                v-model="base.startDate"
-                type="datetime"
-                disabled
-                placeholder="请输入调价日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价部门">
+            <el-form-item label="调价业务员">
               <el-select
-                placeholder="请选择销售类型"
+                placeholder="请选择调价业务员"
                 filterable
-                disabled
-                v-model="saleTypeIds"
+                @change="handleUser"
+                v-model="operatorId"
               >
                 <el-option
-                  v-for="item in typeList"
-                  :label="item.saleName"
-                  :value="item.id"
+                  v-for="(item, index) in userList"
+                  :label="item.nickName"
+                  :value="item.roleId"
+                  :key="index"
                 ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价业务员">
-              <el-input placeholder="请输入" disabled></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="制单日期">
-              <el-date-picker
-                v-model="startDate"
+            <el-form-item label="调价部门">
+              <el-input
+                placeholder="调价部门"
                 disabled
-                type="datetime"
-                placeholder="请输入制单日期"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
+                v-model="adminCompanyName"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -281,7 +262,6 @@
                 <el-form-item>
                   <el-select
                     v-model="scope.row.isPromote"
-
                     placeholder="请选择是否促销价"
                   >
                     <el-option
@@ -317,7 +297,7 @@
                 <el-form-item>
                   <el-select
                     v-model="scope.row.walletsId"
-                    @change="handelWallets($event,scope.$index)"
+                    @change="handelWallets($event, scope.$index)"
                     placeholder="请选择现金钱包"
                   >
                     <el-option
@@ -341,7 +321,6 @@
                 <el-form-item>
                   <el-select
                     v-model="scope.row.isPublish"
-
                     placeholder="请选择是否发布"
                   >
                     <el-option
@@ -541,7 +520,6 @@
                 <el-form-item>
                   <el-select
                     v-model="scope.row.isPromote"
-
                     placeholder="请选择是否促销价"
                   >
                     <el-option
@@ -574,11 +552,9 @@
               min-width="160"
               show-overflow-tooltip
               ><template slot-scope="scope">
-
                 <el-form-item>
                   <el-select
                     v-model="scope.row.isPublish"
-
                     placeholder="请选择支付钱包类型"
                   >
                     <el-option
@@ -602,7 +578,6 @@
                 <el-form-item>
                   <el-select
                     v-model="scope.row.isPublish"
-
                     placeholder="请选择是否发布"
                   >
                     <el-option
@@ -653,7 +628,7 @@
       </div>
     </div>
     <div class="btn-group clearfix">
-      <el-button size="small"  @click="handleReseat">重置</el-button>
+      <el-button size="small" @click="handleReseat">重置</el-button>
       <el-button size="small" type="primary" @click="hanleSbumit"
         >提交</el-button
       >
@@ -661,10 +636,143 @@
         style="float: right"
         type="primary"
         size="small"
-        @click="(centerDialogVisible = true), getMaterialList()"
+        @click="(centerDialogVisible = true), handleDataList()"
         >添加</el-button
       >
     </div>
+
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="80%" center>
+      <div>
+        <el-form
+          ref="dialogForm"
+          :model="dialogForm"
+          label-width="70px"
+          size="small"
+          label-position="left"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="名称" prop="keyword">
+                <el-input
+                  placeholder="请输入名称"
+                  v-model="dialogForm.keyword"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
+              <el-form-item label="">
+                <el-button size="small" @click="resetScreenForm"
+                  >清空</el-button
+                >
+                <el-button size="small" type="primary" @click="handleDataList"
+                  >搜索</el-button
+                >
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="mymain-container">
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            @select-all="handleSelectionAllChange"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="55"> </el-table-column>
+
+            <el-table-column
+              align="center"
+              label="使用组织"
+              prop="useOrgName"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="编码"
+              prop="number"
+              min-width="100"
+              label-class-name="bianma"
+              class-name="fontstyle"
+            ></el-table-column>
+
+            <el-table-column
+              align="center"
+              label="名称"
+              prop="name"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="规格型号"
+              prop="specification"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="数据状态"
+              prop="forbidStatus"
+              min-width="100"
+            >
+              <template slot-scope="scope">
+                <el-tag type="success" v-if="scope.row.forbidStatus == 'A'"
+                  >正常</el-tag
+                >
+                <el-tag type="danger" v-else>禁用</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="是否维护商城资料"
+              prop="maintainData"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="是否维护内外机档案"
+              prop="maintainFiles"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="基本单位"
+              prop="baseUnitId"
+              min-width="100"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              label="已使用"
+              prop="used"
+              min-width="100"
+            ></el-table-column>
+          </el-table>
+        </div>
+        <!-- 分页 -->
+        <div class="fr">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
+          </el-pagination>
+        </div>
+      </div>
+       <span slot="footer" class="dialog-footer">
+    <el-button @click="centerDialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="handleDetermine  ">确 定</el-button>
+  </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -675,10 +783,14 @@ import {
   getTypeList,
   getMaterialList,
   getRebate,
-  getTree
+  getUserList,
+  getMaterialDetail,
 } from "@/api/basic_data/material";
 
+import MaterialListDetail from "./material_list-detail.vue";
+import Mixin from "@/mixin/index";
 export default {
+  mixins: [Mixin],
   data() {
     return {
       listLoading: false,
@@ -703,10 +815,21 @@ export default {
       rebateList: [],
       typeList: [],
       saleTypeId: "",
+      operatorId: "",
+      adminCompanyId: "",
+      operatorName: "",
+      adminCompanyName: "",
+      adminWebsitId: "",
       remark: "",
       detail: [],
       form: {},
       startDate: "",
+      userList: [],
+      centerDialogVisible: false,
+      dialogForm: {
+        keyword: "",
+      },
+      selectData:[]
     };
   },
   mounted() {
@@ -720,25 +843,44 @@ export default {
     getTypeList(params).then((res) => {
       this.typeList = res.data.records;
     });
-    getTree().then(res=>{
-      console.log(res,'bumeng');
-    })
+    getUserList({
+      pageNum: 1,
+      pageSize: -1,
+      adminWebsitId: "",
+      isCustomer: 0,
+      roleId: "",
+      status: "",
+      userName: "",
+    }).then((res) => {
+      console.log(res, "bumeng");
+      this.userList = res.data.records;
+    });
   },
   methods: {
-    handelWallets(e,index){
-      // console.log(e, 'hao' ,index);
+    handelWallets(e, index) {
       this.items[index].wallets = [
-          {
-            billId: "",
-            id: "",
-            mainId: "",
-            parentId: "",
-            parentItemId: e,
-          },
-        ]
+        {
+          billId: "",
+          id: "",
+          mainId: "",
+          parentId: "",
+          parentItemId: e,
+        },
+      ];
+    },
+    handleUser(e) {
+      const adminCompany = this.userList.filter((k) => {
+        return e == k.roleId;
+      })[0];
+      this.adminWebsitId = adminCompany.adminUserId;
+      this.adminCompanyName = adminCompany.adminCompanyName;
+      this.operatorName = adminCompany.roleName;
+      this.operatorId = adminCompany.roleId;
     },
     goBack() {
       this.$parent.show = 1;
+      // 更新父组件数据
+      this.$parent.getList();
     },
     indexMethod(index) {
       console.log(index);
@@ -746,6 +888,59 @@ export default {
     hanleDeleInd(index) {
       this.items.splice(index, 1);
     },
+    handleDetermine(){
+      if (this.selectData.length) {
+
+          for (let i = 0; i < array.length; i++) {
+            const element = array[i];
+          }
+           this.items.push({
+          baseUnitId: "",
+          batchPrice: "",
+          billId: "",
+          endDate: "",
+          id: null,
+          isPromote: "",
+          isPublish: "",
+          materialId: this.materialId,
+          materialName: "",
+          materialNumber: "",
+          parentId: "",
+          qty: "",
+          rebateUseRate: "",
+          retailPrice: "",
+          saleTypeId: "",
+          specification: "",
+          startDate: "",
+          wallets: [],
+          rebateList: [...this.rebateList],
+          isPublishArr: [
+            {
+              value: "是",
+              bool: 1,
+            },
+            {
+              value: "否",
+              bool: 0,
+            },
+          ],
+          isPromoteArr: [
+            {
+              value: "是",
+              bool: 1,
+            },
+            {
+              value: "否",
+              bool: 0,
+            },
+          ],
+        });
+          this.centerDialogVisible = false
+      }else{
+        this.$errorMsg('请选择内容')
+      }
+
+    },
     getMaterialList() {
       let rebateParams = {
         pageNum: 1,
@@ -757,7 +952,7 @@ export default {
       };
       getRebate(rebateParams).then((res) => {
         this.rebateList = res.data.records;
-        console.log(this.rebateList,'this.rebateList');
+        console.log(this.rebateList, "this.rebateList");
       });
       let params = {
         pageNum: 1,
@@ -768,62 +963,40 @@ export default {
         this.materialLis = res.data.records;
       });
     },
+    handleSelectionAllChange(e) {
+        this.selectData = e
+    },
+    handleSelectionChange(e) {
+      this.selectData = e
+    },
     hanleAdd() {
       if (this.materialId) {
-          this.items.push({
-        baseUnitId: "",
-        batchPrice: "",
-        billId: "",
-        endDate: "",
-        id: null,
-        isPromote: "",
-        isPublish: "",
-        materialId: this.materialId,
-        materialName: "",
-        materialNumber: "",
-        parentId: "",
-        qty: "",
-        rebateUseRate: "",
-        retailPrice: "",
-        saleTypeId: this.saleTypeId,
-        specification: "",
-        startDate: "",
-        wallets: [
 
-        ],
-        rebateList: [...this.rebateList],
-        isPublishArr: [
-          {
-            value: "是",
-            bool: 1,
-          },
-          {
-            value: "否",
-            bool: 0,
-          },
-        ],
-        isPromoteArr: [
-          {
-            value: "是",
-            bool: 1,
-          },
-          {
-            value: "否",
-            bool: 0,
-          },
-        ],
-      });
-      this.centerDialogVisible = false;
-      }else{
-        this.$errorMsg('请选择产品')
+        this.centerDialogVisible = false;
+      } else {
+        this.$errorMsg("请选择产品");
       }
-
+    },
+    handleDataList() {
+      this.listLoading = true;
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: 5 || this.pageSize,
+        keyword: this.dialogForm.keyword,
+      };
+      getMaterialList(params).then((res) => {
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
     },
     hanleSbumit() {
-
       const params = {
         ...this.base,
         items: this.items,
+        saleTypeId: this.saleTypeId,
+        adminWebsitId: this.adminWebsitId,
+        operatorId: this.operatorId,
       };
       getProductRriceAdd(params).then((res) => {
         this.items = {
@@ -879,18 +1052,18 @@ export default {
           remark: "",
           saleTypeId: "",
         };
+        this.$successMsg("成功");
+        // getProductRriceDetail({ id: res.data }).then((res) => {
+        //   this.base = {
+        //     ...res.data,
+        //   };
 
-        getProductRriceDetail({ id: res.data }).then((res) => {
-          this.base = {
-            ...res.data,
-          };
-
-          this.detail = res.data.items;
-        });
+        //   this.detail = res.data.items;
+        // });
       });
     },
-    handleReseat(){
-        this.base= {
+    handleReseat() {
+      this.base = {
         adminCompanyId: "",
         adminWebsitId: "",
         billId: "",
@@ -902,10 +1075,10 @@ export default {
         operatorName: "",
         remark: "",
         saleTypeId: "",
-      }
-      this.saleTypeId = ''
-       this.items= []
-    }
+      };
+      this.saleTypeId = "";
+      this.items = [];
+    },
   },
 };
 </script>

src/views/basic_data/material/components/modify_list-approval.vue

@@ -9,7 +9,7 @@
       <el-form
         ref="screenForm"
         :model="detail"
-        label-width="70px"
+        label-width="120px"
         size="small"
         label-position="left"
       >
@@ -24,17 +24,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价日期" prop="account">
-              <el-date-picker
-                disabled
-                v-model="value1"
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价部门" prop="account">
               <el-input placeholder="请输入" disabled></el-input>
             </el-form-item>
@@ -49,17 +38,6 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="制单日期" prop="account">
-              <el-date-picker
-                v-model="value1"
-                disabled
-                type="date"
-                placeholder="选择日期"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售类型" prop="account">
               <el-select placeholder="请选择活动区域" disabled>
                 <el-option label="区域一" value="shanghai"></el-option>
@@ -208,21 +186,22 @@
           <el-row :gutter="0">
             <el-col :xs="12" :sm="12" :lg="12" class="item">
               <div class="label">审批人</div>
-              <div class="value">{{ detail.operatorName }}</div>
+              <div class="value">{{ this.$store.getters.name }}</div>
             </el-col>
             <el-col :xs="12" :sm="12" :lg="12" class="item">
               <div class="label">审批结果</div>
               <div class="value">
                 <el-radio-group v-model="detail.examineResult">
-                  <el-radio label="0">通过</el-radio>
-                  <el-radio label="1">驳回</el-radio>
+                  <el-radio :label="true">通过</el-radio>
+                  <el-radio :label="false">驳回</el-radio>
                 </el-radio-group>
               </div>
             </el-col>
-
             <el-col :xs="24" :sm="24" :lg="24" class="item">
               <div class="label">审批说明</div>
-              <div class="value">{{ detail.examineNote }}</div>
+              <div class="value">
+                <el-input v-model="detail.examineNote " size="small"></el-input>
+              </div>
             </el-col>
           </el-row>
         </div>
@@ -237,7 +216,7 @@
             > -->
           </div>
         </div>
-      </el-form>
+   </el-form>
     </div>
   </div>
 </template>
@@ -283,7 +262,6 @@ export default {
     onSubmit() {
       const params = {
         ...this.detail,
-        qty: 23,
       };
       getProductRriceConfirm(params).then((res) => {
          this.$successMsg("已提交审核");

src/views/basic_data/material/machine_list.vue

@@ -19,11 +19,11 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="型号" prop="type">
+            <el-form-item label="型号" prop="model">
               <el-input
                 type="number"
                 placeholder="请输入型号"
-                v-model.number="screenForm.type"
+                v-model.number="screenForm.model"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -85,8 +85,6 @@
         </el-popconfirm>
       </div>
       <div class="fr">
-
-
         <!-- <el-upload
           class="import-btn upload-demo"
           :action="baseURL + 'student/import'"
@@ -123,7 +121,12 @@
             prop="type"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column>
+          >
+          <template slot-scope="scope">
+            {{scope.row.type=='INNER'?'内机':scope.row.type=='OUTSIDE'?'外机':'配件'}}
+          </template>
+
+          </el-table-column>
           <el-table-column
             align="center"
             label="名称"
@@ -244,7 +247,7 @@
         label-position="left"
       >
         <el-form-item label="类型">
-          <el-select v-model="diaLogForm.type" placeholder="请选择">
+          <el-select v-model="diaLogForm.type" filterable  placeholder="请选择">
             <el-option
               v-for="item in distList"
               :key="item.dictCode"
@@ -287,7 +290,6 @@ import {
   getMachineEdit,
   getDistList,
 } from "@/api/basic_data/material";
-import { number } from "yargs";
 import print from 'vue-print-nb'
 export default {
   mixins: [Mixin],
@@ -336,7 +338,8 @@ export default {
       dataList: [
 
       ],
-      searchForm: {
+      screenForm: {
+        model:'',
         name: "",
         number: "",
         type: "",
@@ -347,6 +350,12 @@ export default {
 
     };
   },
+  created() {
+     getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((res) => {
+        this.distList = res.data;
+        console.log(res, 123);
+      });
+  },
   methods: {
     editFn(id, row) {
       this.type = 2;
@@ -385,9 +394,9 @@ export default {
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        name: this.screenForm.name,
+        name: this.screenForm.name ,
         number: this.screenForm.number,
-        type: this.screenForm.type,
+        model: this.screenForm.model,
         volume: this.screenForm.volume,
       };
       getMachineLlist(params).then((res) => {
@@ -396,10 +405,7 @@ export default {
         this.listLoading = false;
         console.log(this.dataList, 1233);
       });
-      getDistList({ sysDictEnum: "MACHINE_CONFIGURE" }).then((res) => {
-        this.distList = res.data;
-        console.log(res, 123);
-      });
+
     },
     // 导入
     async handleImport(param) {

src/views/basic_data/warehouse/components/warehouse_list-detail.vue

@@ -258,20 +258,20 @@
                        <el-col :span="12"
                       >
                     <el-form-item label="允许客户查询" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.allowMinusQty" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.allowMinusQty" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
 
                      </el-col>
                     <el-col :span="12"
                       >
                     <el-form-item label="允许即时库存负库存" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.allowMinusQty" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.allowMinusQty" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
                      </el-col>
                     <el-col :span="12"
                       >
                         <el-form-item label="允许MRP计划" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.allowMrpPlan" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.allowMrpPlan" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
                      </el-col>
                   </el-row>
@@ -279,13 +279,13 @@
                     <el-col :span="12"
                       >
                            <el-form-item label="允许锁库" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.allowLock" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.allowLock" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
                      </el-col>
                     <el-col :span="12"
                       >
                             <el-form-item label="参与预警" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.availableAlert" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.availableAlert" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
                      </el-col>
                   </el-row>
@@ -293,14 +293,14 @@
                     <el-col :span="12"
                       >
                            <el-form-item label="启用仓位管理" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.openLocation" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.openLocation" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
 
                       </el-col>
                     <el-col :span="12"
                       >
                           <el-form-item label="参与拣货" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.availablePicking" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.availablePicking" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
 
                       </el-col>
@@ -309,7 +309,7 @@
                     <el-col :span="12"
                       >
                          <el-form-item label="不参与可发量统计" size="small">
-                        <el-radio :readonly="isReadonly" v-model="detail.notExpQty" :label="true">{{''}}</el-radio>
+                        <el-checkbox :readonly="isReadonly" v-model="detail.notExpQty" :label="true">{{''}}</el-checkbox>
                     </el-form-item>
 
                       </el-col>

src/views/basic_data/warehouse/warehouse_site.vue

@@ -81,7 +81,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <template v-if="scope.row.kingDeeStocks.length > 1">
+              <template v-if="scope.row.kingDeeStocks.length > 0">
                 <el-tag type="danger"  style="margin-right: 10px;" v-for="item in scope.row.kingDeeStocks">
                   {{ item.name }}
                 </el-tag>

src/views/sales_rebate/salestype_list.vue

@@ -1,77 +1,141 @@
 <template>
   <div class="app-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left">
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+
+        size="small"
+        label-position="left"
+      >
         <el-row :gutter="20">
           <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop='saleCode'>
-              <el-input v-model="screenForm.saleCode" placeholder="销售类型编码" size="small"></el-input>
+            <el-form-item prop="saleCode">
+              <el-input
+                v-model="screenForm.saleCode"
+                placeholder="销售类型编码"
+                size="small"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop='saleName'>
-              <el-input v-model="screenForm.saleName" placeholder="销售类型名称" size="small"></el-input>
+            <el-form-item prop="saleName">
+              <el-input
+                v-model="screenForm.saleName"
+                placeholder="销售类型名称"
+                size="small"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop='status'>
-              <el-select v-model="screenForm.status" placeholder="状态" size="small">
-
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+            <el-form-item prop="status">
+              <el-select
+                v-model="screenForm.status"
+                placeholder="状态"
+                size="small"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :ms="6" :lg="6" class="tr">
             <el-form-item>
-              <el-button type="primary" size="small" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="small" @click="resetScreenForm">重置</el-button>
+              <el-button type="primary" size="small" @click="submitScreenForm"
+                >查询</el-button
+              >
+              <el-button type="primary" size="small" @click="resetScreenForm"
+                >重置</el-button
+              >
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </div>
     <div class="btn-group">
-      <el-button type="primary" size="small" @click="dialogVisible = true,type=1">新增</el-button>
-      <!--  <el-button type="primary" size="small" @click="dialogVisible = true"
-        >编辑</el-button
+      <el-button
+        type="primary"
+        size="small"
+        @click="(dialogVisible = true), (type = 1)"
+        >新增</el-button
       >
-      <el-button type="primary" size="small" @click="">删除</el-button>
-      <el-button type="primary" size="small" @click="">导入</el-button>
-      <el-button type="primary" size="small" @click="">导出</el-button> -->
     </div>
     <div class="mymain-container">
-      <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row
-        stripe>
+      <el-table
+        v-loading="listLoading"
+        :data="dataList"
+        element-loading-text="Loading"
+        border
+        fit
+        highlight-current-row
+        stripe
+      >
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
         <template v-for="col in columns">
-          <el-table-column align="center" :label="col.lable" :prop="col.prop" :min-width="col.widht"
-            show-overflow-tooltip v-if="col.prop == 'status'">
+          <el-table-column
+            align="center"
+            :label="col.lable"
+            :prop="col.prop"
+            :min-width="col.widht"
+            show-overflow-tooltip
+            v-if="col.prop == 'status'"
+          >
             <template slot-scope="scope">
-              <div style="z-index:99">
-                <el-switch v-model="scope.row.status" disabled  :active-text="scope.row.status ? '已启用' : '已禁用'">
-              </el-switch>
+              <div style="z-index: 99">
+                <el-switch
+                  v-model="scope.row.status"
+                  disabled
+                  :active-text="scope.row.status ? '已启用' : '已禁用'"
+                >
+                </el-switch>
               </div>
             </template>
           </el-table-column>
-          <el-table-column v-else align="center" :label="col.lable" :prop="col.prop" :min-width="col.widht"
-            show-overflow-tooltip>
+          <el-table-column
+            v-else
+            align="center"
+            :label="col.lable"
+            :prop="col.prop"
+            :min-width="col.widht"
+            show-overflow-tooltip
+          >
           </el-table-column>
         </template>
 
-        <el-table-column align="center" fixed="right" label="操作" min-width="160">
+        <el-table-column
+          align="center"
+          fixed="right"
+          label="操作"
+          min-width="160"
+        >
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hanleEdit(scope.row)">编辑</el-button>
+            <el-button type="text" size="small" @click="hanleEdit(scope.row)"
+              >编辑</el-button
+            >
             <!-- <el-button type="text" size="small" @click="hanleDateil(scope.row)">详情</el-button> -->
-            <el-popconfirm title="这是一段内容确定删除吗？" style="margin-left: 10px;">
-              <el-button slot="reference" type="text" size="small" @click="hanleDatele(scope.row.id)">删除</el-button>
+            <el-popconfirm
+              title="这是一段内容确定删除吗？"
+              style="margin-left: 10px"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                @click="hanleDatele(scope.row.id)"
+                >删除</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-        <!-- 分页 -->
-      <div style="margin:20px 0">
+      <!-- 分页 -->
+      <div style="margin: 20px 0">
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -85,24 +149,36 @@
       </div>
     </div>
     <div>
-      <el-dialog :visible.sync="dialogVisible" width="50%">
-        <el-form ref="dialogForm" :model="dialogForm" label-width="120px" :inline="false" size="normal">
-          <el-form-item label="销售类型编码">
+      <el-dialog :visible.sync="dialogVisible" width="50%"  @close="resetForm"
+          :close-on-click-modal="false">
+        <el-form
+          ref="dialogForm"
+          :model="dialogForm"
+           :rules="type==1?rules:''"
+          label-width="120px"
+          size="normal"
+        >
+          <el-form-item label="销售类型编码" prop="saleCode">
             <el-input v-model="dialogForm.saleCode"></el-input>
           </el-form-item>
-          <el-form-item label="销售类型名称">
-            <el-input v-model="dialogForm.saleName"></el-input>
+          <el-form-item label="销售类型名称" prop="saleName">
+            <el-input v-model="dialogForm.saleName" ></el-input>
           </el-form-item>
-          <el-form-item label="品类">
+          <el-form-item label="品类" prop="mainName">
             <el-input v-model="dialogForm.mainName"></el-input>
           </el-form-item>
-          <el-form-item label="状态">
-            <el-switch v-model="dialogForm.status" :active-value='true' :inactive-value='false'
-              :active-text="dialogForm.status? '启用' : ''"> </el-switch>
+          <el-form-item label="状态" prop="status">
+            <el-switch
+              v-model="dialogForm.status"
+              :active-value="true"
+              :inactive-value="false"
+              :active-text="dialogForm.status ? '启用' : ''"
+            >
+            </el-switch>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button @click="dialogVisible = false,resetForm()">取 消</el-button>
           <el-button type="primary" @click="handelInfo">确 定</el-button>
         </span>
       </el-dialog>
@@ -111,187 +187,209 @@
 </template>
 
 <script>
-  import Mixin from "@/mixin/index";
-  import Pagination from "@/components/Pagination";
-  import {
-    getTypeList,
-    delTypeData,
-    addData,
-    updateType,
-    getDetail
-  } from "@/api/supply/sales"
+import Mixin from "@/mixin/index";
+import Pagination from "@/components/Pagination";
+import {
+  getTypeList,
+  delTypeData,
+  addData,
+  updateType,
+  getDetail,
+} from "@/api/supply/sales";
 
-  export default {
-    mixins: [Mixin],
-    data() {
-      return {
-        type: 0, // 0,1
-        screenForm: {
-          saleCode: '',
-          saleName: '',
-          status: ''
-        },
-        dialogForm: {
-          id: '',
-          saleCode: '',
-          saleName: '',
-          mainName: '',
-          status: true,
-        },
-        dataList: [{
+export default {
+  mixins: [Mixin],
+  data() {
+    return {
+      type: 0, // 0,1
+      screenForm: {
+        saleCode: "",
+        saleName: "",
+        status: "",
+      },
+      dialogForm: {
+        id: "",
+        saleCode: "",
+        saleName: "",
+        mainName: "",
+        status: true,
+      },
+      dataList: [
+        {
           date: "2016-05-02",
           name: "王小虎",
           label: "姓名",
           address: "上海市普陀区金沙江路 1518 弄",
-        }, ],
-        columns: [{
-            prop: "saleCode",
-            lable: "销售类型编码",
-            widht: 160
-          },
-          {
-            prop: "saleName",
-            lable: "销售类型名称",
-            widht: 160
-          },
+        },
+      ],
+      columns: [
+        {
+          prop: "saleCode",
+          lable: "销售类型编码",
+          widht: 160,
+        },
+        {
+          prop: "saleName",
+          lable: "销售类型名称",
+          widht: 160,
+        },
 
-          {
-            prop: "mainName",
-            lable: "产品大类",
-            widht: 160
-          },
-          {
-            prop: "status",
-            lable: "状态",
-            widht: 160
-          },
-          {
-            prop: "createBy",
-            lable: "创建人",
-            widht: 160
-          },
-          {
-            prop: "createTime",
-            lable: "创建时间",
-            widht: 160
-          },
-          {
-            prop: "updateBy",
-            lable: "更新人",
-            widht: 160
-          },
-          {
-            prop: "updateTime",
-            lable: "更新时间",
-            widht: 160
-          },
-        ],
-        options: [{
-            value: '',
-            label: '状态'
-          },{
-            value: 1,
-            label: '已启用'
-          },
-          {
-            value: 0,
-            label: '已停用'
-          }
-        ]
+        {
+          prop: "mainName",
+          lable: "产品大类",
+          widht: 160,
+        },
+        {
+          prop: "status",
+          lable: "状态",
+          widht: 160,
+        },
+        {
+          prop: "createBy",
+          lable: "创建人",
+          widht: 160,
+        },
+        {
+          prop: "createTime",
+          lable: "创建时间",
+          widht: 160,
+        },
+        {
+          prop: "updateBy",
+          lable: "更新人",
+          widht: 160,
+        },
+        {
+          prop: "updateTime",
+          lable: "更新时间",
+          widht: 160,
+        },
+      ],
+      options: [
+        {
+          value: "",
+          label: "状态",
+        },
+        {
+          value: 1,
+          label: "已启用",
+        },
+        {
+          value: 0,
+          label: "已停用",
+        },
+      ],
+      rules: {
+        saleCode: [{required: true,message: '请输入销售类型编码', trigger: 'blur'}],
+        saleName: [{required: true,message: '请输入销售类型名称', trigger: 'blur'}],
+           mainName: [{required: true,message: '请输入品类名称', trigger: 'blur'}],
+      },
+    };
+  },
+  methods: {
+    getList() {
+      this.listLoading = true;
+      const params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        saleCode: this.screenForm.saleCode,
+        saleName: this.screenForm.saleName,
+        status: this.screenForm.status,
       };
+      getTypeList(params).then((res) => {
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      });
     },
-    methods: {
-      getList() {
-        this.listLoading = true
-        const params = {
-          pageNum: this.currentPage,
-          pageSize: this.pageSize,
-          saleCode: this.screenForm.saleCode,
-          saleName: this.screenForm.saleName,
-          status: this.screenForm.status
-        }
-        getTypeList(params).then(res => {
-          this.dataList = res.data.records
-           this.listTotal = res.data.total;
-          this.listLoading = false
-        })
-      },
-      hanleDatele(id) {
-        this.hanleDeleteAllPromise(id).then(ids => {
-          delTypeData({
-            id: ids[0]
-          }).then(res => {
-            this.$successMsg("删除成功")
-            this.getList()
-          })
-        })
-      },
-      hanleEdit(item) {
-        this.dialogForm = {
-          id: item.id,
-          saleCode: item.saleCode,
-          saleName: item.saleName,
-          mainName: item.mainName,
-          status: item.status,
-        }
-        this.type =0
-        this.dialogVisible = true
+    hanleDatele(id) {
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        delTypeData({
+          id: ids[0],
+        }).then((res) => {
+          this.$successMsg("删除成功");
+          this.getList();
+        });
+      });
+    },
+    hanleEdit(item) {
+      this.dialogForm = {
+        id: item.id,
+        saleCode: item.saleCode,
+        saleName: item.saleName,
+        mainName: item.mainName,
+        status: item.status,
+      };
+      this.type = 0;
+      this.dialogVisible = true;
+    },
+    hanleDateil(item) {
+      this.dialogVisible = true;
+      this.dialogForm = {
+        ...item,
+      };
+      this.type = 3;
+    },
+    handelInfo() {
 
-      },
-      hanleDateil(item) {
-        this.dialogVisible = true
-        this.dialogForm = {
-          ...item
-        }
-        this.type =3
-      },
-      handelInfo() {
-        if (this.type==1) {
+      if (this.type == 1) {
+            this.$refs.dialogForm.validate((valid) => {
+          if (valid) {
           const params = {
-            ...this.dialogForm
-          }
-          addData(params).then(res => {
-            console.log(res);
-            this.$successMsg("添加成功")
+          ...this.dialogForm,
+        };
+        addData(params).then((res) => {
+          console.log(res);
+          this.$successMsg("添加成功");
+          this.hanleReset();
 
-            this.hanleReset()
-          })
-        } else if(this.type == 0) {
-          const upParams = {
-            ...this.dialogForm
+        });
+          } else {
+            console.log('error submit!!');
+            return false;
           }
-          updateType(upParams).then(res => {
-            this.$successMsg("修改成功")
+        });
 
-            this.hanleReset()
-          })
-        }else{
-          this.dialogVisible= false
-        }
-      },
-      hanleReset() {
-        this.dialogForm = {
-          id: '',
-          saleCode: '',
-          saleName: '',
-          mainName: '',
-          status: true,
-        }
-        // this.$refs.dialogForm.resetFields()
-        this.dialogVisible = false
-        this.getList()
+      } else if (this.type == 0) {
+        const upParams = {
+          ...this.dialogForm,
+        };
+        updateType(upParams).then((res) => {
+          this.$successMsg("修改成功");
 
+          this.hanleReset();
+
+        });
+      } else {
+        this.dialogVisible = false;
       }
+    },
+     resetForm(formName) {
+        this.$refs.dialogForm.resetFields();
 
     },
-    components: {
-      Pagination,
+    hanleReset() {
+
+      this.dialogForm = {
+        id: "",
+        saleCode: "",
+        saleName: "",
+        mainName: "",
+        status: true,
+      };
+      // this.$refs.dialogForm.resetFields()
+      this.dialogVisible = false;
+      this.getList();
     },
-  };
+  },
+  components: {
+    Pagination,
+  },
+};
 </script>
 
 <style scoped>
-.el-switch.is-disabled{
-  opacity:inherit;
+.el-switch.is-disabled {
+  opacity: inherit;
 }
 </style>

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

@@ -1,396 +1,3 @@
-<!-- <template>
-  <div class="app-container">
-    <div class="screen-container">
-      <el-radio-group
-        v-model="screenForm.examineStatus"
-        style="margin-bottom: 30px"
-        size="small"
-      >
-        <el-radio-button
-          v-for="(item, index) in tabs"
-          :key="index"
-          :label="item.label"
-          >{{ item.text }}</el-radio-button
-        >
-      </el-radio-group>
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        size="small"
-        label-position="left"
-      >
-        <el-row :gutter="20">
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="id">
-              <el-input
-                v-model="screenForm.id"
-                placeholder="订单号"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="policyCode">
-              <el-input
-                v-model="screenForm.policyCode"
-                placeholder="销售政策编号"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="policyRemark">
-              <el-input
-                v-model="screenForm.policyRemark"
-                placeholder="销售政策说明"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="customer">
-              <el-input
-                v-model="screenForm.customer"
-                placeholder="经销商"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="screenForm.startTime"
-                type="datetime"
-                placeholder="订单日期"
-                default-time="00:00:00"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="createBy">
-              <el-input
-                v-model="screenForm.createBy"
-                placeholder="制表人"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="examineBy">
-              <el-input
-                v-model="screenForm.examineBy"
-                placeholder="审核人"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6" class="tr">
-            <el-form-item>
-              <el-button type="primary" size="small" @click="submitScreenForm"
-                >查询</el-button
-              >
-              <el-button type="primary" size="small" @click="resetScreenForm"
-                >重置</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="btn-group">
-      <el-button type="primary" size="small" @click="handleExport"
-        >导出</el-button
-      >
-
-    </div>
-    <div class="mymain-container">
-      <el-table
-        v-loading="listLoading"
-        :data="dataList"
-        element-loading-text="Loading"
-        border
-        fit
-        highlight-current-row
-        stripe
-      >
-        <el-table-column type="selection" width="55" align="center">
-        </el-table-column>
-        <template v-for="col in columns">
-          <el-table-column
-            v-if="col.name == 'isDirectTransfer'"
-            align="center"
-            :label="col.lable"
-            :prop="col.prop"
-            :min-width="col.widht"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-tag
-                type="success"
-                size="small"
-                v-if="scope.row.isDirectTransfer"
-                >是</el-tag
-              >
-              <el-tag type="danger" size="small" v-else>否</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-else-if="col.name == 'examineStatus'"
-            align="center"
-            :label="col.lable"
-            :prop="col.prop"
-            :min-width="col.widht"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-tag type="success" size="small">{{
-                status[scope.row.examineStatus]
-              }}</el-tag>
-              ]
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-else
-            align="center"
-            :label="col.lable"
-            :prop="col.prop"
-            :min-width="col.widht"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-        </template>
-        <el-table-column
-          align="center"
-          fixed="right"
-          label="操作"
-          min-width="160"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hanleEdit(scope.row)"
-              >审批</el-button
-            >
-            <el-button type="text" size="small" @click="hanleDateil(scope.row)"
-              >退订</el-button
-            >
-            <el-button type="text" size="small" @click="hanleDateil(scope.row)"
-              >详情</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import Mixin from "@/mixin/index";
-import { getList } from "@/api/supply/policy";
-import { downloadFiles } from "@/utils/util";
-
-export default {
-  mixins: [Mixin],
-  data() {
-    return {
-      type: 0, // 0,1
-      screenForm: {
-        id: "",
-        policyCode: "",
-        policyRemark: "",
-        customer: "",
-        startTime: "",
-        createBy: "",
-        examineBy: "",
-        examineStatus: "",
-        type: 2,
-      },
-      dialogForm: {},
-      dataList: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          label: "姓名",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-      ],
-      columns: [
-        {
-          prop: "id",
-          lable: "订单号",
-          widht: 160,
-        },
-        {
-          prop: "createTime",
-          lable: "订单日期",
-          widht: 160,
-        },
-        {
-          prop: "policyCode",
-          lable: "销售政策编号",
-          widht: 160,
-        },
-        {
-          prop: "policyRemark",
-          lable: "销售政策说明",
-          widht: 160,
-        },
-        {
-          prop: "customerName",
-          lable: "经销商",
-          widht: 160,
-        },
-        {
-          prop: "materialId",
-          lable: "产品编号",
-          widht: 160,
-        },
-        {
-          prop: "materialName",
-          lable: "产品名称",
-          widht: 160,
-        },
-        {
-          prop: "specification",
-          lable: "规格型号",
-          widht: 160,
-        },
-        {
-          prop: "totalQty",
-          lable: "总数量",
-          widht: 160,
-        },
-        {
-          prop: "price",
-          lable: "单价",
-          widht: 160,
-        },
-        {
-          prop: "price",
-          lable: "返利类型",
-          widht: 160,
-        },
-        {
-          prop: "price",
-          lable: "返利",
-          widht: 160,
-        },
-        {
-          name: "isDirectTransfer",
-          prop: "isDirectTransfer",
-          lable: "直调",
-          widht: 160,
-        },
-        {
-          prop: "updateTime",
-          lable: "直调数量",
-          widht: 160,
-        },
-        {
-          prop: "directTransferQty",
-          lable: "出库数量",
-          widht: 160,
-        },
-        {
-          prop: "serviceName",
-          lable: "业务员",
-          widht: 160,
-        },
-        {
-          prop: "createBy",
-          lable: "制表人",
-          widht: 160,
-        },
-        {
-          prop: "createTime",
-          lable: "制表日期",
-          widht: 160,
-        },
-        {
-          prop: "examineBy",
-          lable: "审核人",
-          widht: 160,
-        },
-        {
-          prop: "examineTime",
-          lable: "审核日期",
-          widht: 160,
-        },
-        {
-          name: "examineStatus",
-          prop: "examineStatus",
-          lable: "审核状态",
-          widht: 160,
-        },
-      ],
-
-      tabs: [
-        {
-          label: "",
-          text: "全部",
-        },
-        {
-          label: "1",
-          text: "已保存",
-        },
-        {
-          label: "2",
-          text: "待审核",
-        },
-        {
-          label: "3",
-          text: "审核通过",
-        },
-        {
-          label: "4",
-          text: "审核驳回",
-        },
-      ],
-      statusList: {
-        SAVE: "保存",
-        WAIT: "待审核",
-        OK: "通过",
-        FAIL: "不通过",
-        CLOSE: "已关闭",
-      },
-    };
-  },
-  methods: {
-    getList() {
-      this.listLoading = true;
-      const params = {
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        ...this.screenForm,
-      };
-      getList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      });
-    },
-    handleExport() {
-      let screenData = {
-        ...this.screenForm
-      };
-      downloadFiles("/retail/export", screenData);
-    },
-  },
-};
-</script>
-<style scoped></style> -->
 <template>
   <div class="app-container">
     <div

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

@@ -591,7 +591,7 @@
           </el-row>
         </el-form>
         <el-row type="flex" :gutter="20">
-          <el-col>已选择限定机型</el-col>
+          <el-col style="margin:10px 0">已选择限定机型</el-col>
           <el-col></el-col>
           <el-col></el-col>
           <el-col></el-col>
@@ -937,7 +937,7 @@ export default {
         type: "COMMONLY",
       }).then((res) => {
         this.xjWalletList = res.data;
-
+      console.log(res.data,'xxxxx');
       });
 
       getWalletList({
@@ -1128,8 +1128,11 @@ export default {
           }
         }
         this.cusIndex = 0;
+        this.radio = ''
+        this.dataList = []
+        this.screenForm.policyId = ''
         this.isShowDialog = false;
-        console.log(this.goodsList,'goodsList');
+
       } else {
         this.$errorMsg("请选择");
       }

src/views/supply/policy/policy_list.vue

@@ -1,396 +1,3 @@
-<!-- <template>
-  <div class="app-container">
-    <div class="screen-container">
-      <el-radio-group
-        v-model="screenForm.examineStatus"
-        style="margin-bottom: 30px"
-        size="small"
-      >
-        <el-radio-button
-          v-for="(item, index) in tabs"
-          :key="index"
-          :label="item.label"
-          >{{ item.text }}</el-radio-button
-        >
-      </el-radio-group>
-      <el-form
-        ref="screenForm"
-        :model="screenForm"
-        size="small"
-        label-position="left"
-      >
-        <el-row :gutter="20">
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="id">
-              <el-input
-                v-model="screenForm.id"
-                placeholder="订单号"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="policyCode">
-              <el-input
-                v-model="screenForm.policyCode"
-                placeholder="销售政策编号"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="policyRemark">
-              <el-input
-                v-model="screenForm.policyRemark"
-                placeholder="销售政策说明"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="customer">
-              <el-input
-                v-model="screenForm.customer"
-                placeholder="经销商"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="startTime">
-              <el-date-picker
-                v-model="screenForm.startTime"
-                type="datetime"
-                placeholder="订单日期"
-                default-time="00:00:00"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="createBy">
-              <el-input
-                v-model="screenForm.createBy"
-                placeholder="制表人"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item prop="examineBy">
-              <el-input
-                v-model="screenForm.examineBy"
-                placeholder="审核人"
-                size="small"
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="6" :lg="6" class="tr">
-            <el-form-item>
-              <el-button type="primary" size="small" @click="submitScreenForm"
-                >查询</el-button
-              >
-              <el-button type="primary" size="small" @click="resetScreenForm"
-                >重置</el-button
-              >
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </div>
-    <div class="btn-group">
-      <el-button type="primary" size="small" @click="handleExport"
-        >导出</el-button
-      >
-
-    </div>
-    <div class="mymain-container">
-      <el-table
-        v-loading="listLoading"
-        :data="dataList"
-        element-loading-text="Loading"
-        border
-        fit
-        highlight-current-row
-        stripe
-      >
-        <el-table-column type="selection" width="55" align="center">
-        </el-table-column>
-        <template v-for="col in columns">
-          <el-table-column
-            v-if="col.name == 'isDirectTransfer'"
-            align="center"
-            :label="col.lable"
-            :prop="col.prop"
-            :min-width="col.widht"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-tag
-                type="success"
-                size="small"
-                v-if="scope.row.isDirectTransfer"
-                >是</el-tag
-              >
-              <el-tag type="danger" size="small" v-else>否</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-else-if="col.name == 'examineStatus'"
-            align="center"
-            :label="col.lable"
-            :prop="col.prop"
-            :min-width="col.widht"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-tag type="success" size="small">{{
-                status[scope.row.examineStatus]
-              }}</el-tag>
-              ]
-            </template>
-          </el-table-column>
-          <el-table-column
-            v-else
-            align="center"
-            :label="col.lable"
-            :prop="col.prop"
-            :min-width="col.widht"
-            show-overflow-tooltip
-          >
-          </el-table-column>
-        </template>
-        <el-table-column
-          align="center"
-          fixed="right"
-          label="操作"
-          min-width="160"
-        >
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="hanleEdit(scope.row)"
-              >审批</el-button
-            >
-            <el-button type="text" size="small" @click="hanleDateil(scope.row)"
-              >退订</el-button
-            >
-            <el-button type="text" size="small" @click="hanleDateil(scope.row)"
-              >详情</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div class="fr">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 50]"
-          :page-size="10"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="listTotal"
-        >
-        </el-pagination>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-import Mixin from "@/mixin/index";
-import { getList } from "@/api/supply/retail";
-import { downloadFiles } from "@/utils/util";
-
-export default {
-  mixins: [Mixin],
-  data() {
-    return {
-      type: 0, // 0,1
-      screenForm: {
-        id: "",
-        policyCode: "",
-        policyRemark: "",
-        customer: "",
-        startTime: "",
-        createBy: "",
-        examineBy: "",
-        examineStatus: "",
-        type: 2,
-      },
-      dialogForm: {},
-      dataList: [
-        {
-          date: "2016-05-02",
-          name: "王小虎",
-          label: "姓名",
-          address: "上海市普陀区金沙江路 1518 弄",
-        },
-      ],
-      columns: [
-        {
-          prop: "id",
-          lable: "订单号",
-          widht: 160,
-        },
-        {
-          prop: "createTime",
-          lable: "订单日期",
-          widht: 160,
-        },
-        {
-          prop: "policyCode",
-          lable: "销售政策编号",
-          widht: 160,
-        },
-        {
-          prop: "policyRemark",
-          lable: "销售政策说明",
-          widht: 160,
-        },
-        {
-          prop: "customerName",
-          lable: "经销商",
-          widht: 160,
-        },
-        {
-          prop: "materialId",
-          lable: "产品编号",
-          widht: 160,
-        },
-        {
-          prop: "materialName",
-          lable: "产品名称",
-          widht: 160,
-        },
-        {
-          prop: "specification",
-          lable: "规格型号",
-          widht: 160,
-        },
-        {
-          prop: "totalQty",
-          lable: "总数量",
-          widht: 160,
-        },
-        {
-          prop: "price",
-          lable: "单价",
-          widht: 160,
-        },
-        {
-          prop: "price",
-          lable: "返利类型",
-          widht: 160,
-        },
-        {
-          prop: "price",
-          lable: "返利",
-          widht: 160,
-        },
-        {
-          name: "isDirectTransfer",
-          prop: "isDirectTransfer",
-          lable: "直调",
-          widht: 160,
-        },
-        {
-          prop: "updateTime",
-          lable: "直调数量",
-          widht: 160,
-        },
-        {
-          prop: "directTransferQty",
-          lable: "出库数量",
-          widht: 160,
-        },
-        {
-          prop: "serviceName",
-          lable: "业务员",
-          widht: 160,
-        },
-        {
-          prop: "createBy",
-          lable: "制表人",
-          widht: 160,
-        },
-        {
-          prop: "createTime",
-          lable: "制表日期",
-          widht: 160,
-        },
-        {
-          prop: "examineBy",
-          lable: "审核人",
-          widht: 160,
-        },
-        {
-          prop: "examineTime",
-          lable: "审核日期",
-          widht: 160,
-        },
-        {
-          name: "examineStatus",
-          prop: "examineStatus",
-          lable: "审核状态",
-          widht: 160,
-        },
-      ],
-
-      tabs: [
-        {
-          label: "",
-          text: "全部",
-        },
-        {
-          label: "1",
-          text: "已保存",
-        },
-        {
-          label: "2",
-          text: "待审核",
-        },
-        {
-          label: "3",
-          text: "审核通过",
-        },
-        {
-          label: "4",
-          text: "审核驳回",
-        },
-      ],
-      statusList: {
-        SAVE: "保存",
-        WAIT: "待审核",
-        OK: "通过",
-        FAIL: "不通过",
-        CLOSE: "已关闭",
-      },
-    };
-  },
-  methods: {
-    getList() {
-      this.listLoading = true;
-      const params = {
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        ...this.screenForm,
-      };
-      getList(params).then((res) => {
-        this.dataList = res.data.records;
-        this.listTotal = res.data.total;
-        this.listLoading = false;
-      });
-    },
-    handleExport() {
-      let screenData = {
-        ...this.screenForm
-      };
-      downloadFiles("/retail/export", screenData);
-    },
-  },
-};
-</script>
-<style scoped></style> -->
 <template>
   <div class="app-container">
     <div