调整页面

src/api/basic_data/material.js

@@ -228,6 +228,16 @@ export function getRebate(params) {
   })
 }
 
+export function getWalletList(params) {
+  return request({
+    url:'/wallet/list',
+    method: 'get',
+    params
+  })
+}
+
+
+
 //产品品类
 
 //产品品类列表

src/api/supply/sales.js

@@ -54,7 +54,7 @@ export function deletePolicy(params) {
 export function getConditionMaterialDetail(params) {
   return request({
     url: '/policy/condition/detail',
-    method: 'post',
+    method: 'get',
     params
   })
 }

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

@@ -9,31 +9,26 @@
           <span>信息</span>
         </div>
         <el-row>
-          <el-col :xs="24" :sm="12" :lg="6"
-            >
-              <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-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-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-form-item label="名称" size="small">
-                <el-input v-model="detail.name"  size="small"></el-input>
-              </el-form-item>
-           </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <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-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-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-form-item label="名称" size="small">
+              <el-input v-model="detail.name" size="small"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-card>
 
@@ -41,252 +36,267 @@
         <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> -->
+        <div>
+          <el-row :gutter="20" type="flex">
+            <el-col :span="24">
+              <div class="base-header">
+                <span>基本信息</span>
+              </div>
+              <el-col>
+                <el-form-item label="规格型号" size="small">
+                  <el-input v-model="detail.specification"></el-input>
+                </el-form-item>
               </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-form-item label="助记码" size="small">
+                  <el-input v-model="detail.specification"></el-input>
+                </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24"
-                ><span class="marg-r">条码</span><input type="text" />
+
+              <el-col>
+                <el-form-item label="旧物料编码" size="small">
+                  <el-input v-model="detail.number"></el-input>
+                </el-form-item>
               </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-form-item label="条码" size="small">
+                  <el-input v-model="detail.materialGroupNumber"></el-input>
+                </el-form-item>
               </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-form-item label="描述" size="small">
+                  <el-input v-model="detail.materialGroupNumber"></el-input>
+                </el-form-item>
               </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-form-item label="物料分组" size="small">
+                  <el-input v-model="detail.materialGroupNumber"></el-input>
+                </el-form-item>
               </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>
-          <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="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>
+              <el-col>
+                <el-form-item label="物料属性" size="small">
+                  <el-select v-model="value">
+                    <el-option label="普通仓库"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
-            <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>
+              <el-col>
+                <el-form-item label="普通仓库" size="small">
+                  <el-select v-model="value">
+                    <el-option label="普通仓库"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
-            <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-col>
+                <el-form-item label="特征件子项" size="small">
+                  <el-select v-model="value">
+                    <el-option label="普通仓库"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col>
+                <el-form-item label="套件" size="small">
+                  <el-select v-model="value">
+                    <el-option label="普通仓库"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col>
+                <el-form-item label="基本单位" size="small">
+                  <el-select v-model="value">
+                    <el-option label="正常"> </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col>
+                <el-form-item label="禁用原因" size="small">
+                  <el-input v-model="detail.specification"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-col>
+            <el-col :span="24">
+              <div class="clearfix">
+                <div class="base-header">
+                  <span>控制</span>
+                </div>
+
+                <el-col :span="12">
+                  <el-form-item label="允许采购" size="small">
+                    <el-checkbox v-model="detail.isPurchase"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="允许销售" size="small">
+                    <el-checkbox v-model="detail.isSale"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item label="允许库存" size="small">
+                    <el-checkbox v-model="detail.isInventory"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="允许生产" size="small">
+                    <el-checkbox v-model="detail.isInventory"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-form-item label="允许委外" size="small">
+                    <el-checkbox v-model="detail.isInventory"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="允许资产" size="small">
+                    <el-checkbox v-model="detail.isInventory"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+              </div>
+
+              <div>
+                <div class="base-header">
+                  <span>财务信息</span>
+                </div>
+
+                <el-col :span="24">
+                  <el-form-item label="默认税率" size="small">
+                    <el-input v-model="value"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="存货类别" size="small">
+                    <el-input v-model="detail.categoryId"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="税分类" size="small">
+                    <el-input v-model="detail.categoryId"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="结算成本价加减价比例" size="small">
+                    <el-input v-model="detail.categoryId"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="商城公开价" size="small">
+                    <el-input v-model="detail.categoryId"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="24">
+                  <el-form-item label="套机码" size="small">
+                    <el-input v-model="detail.categoryId"></el-input>
+                  </el-form-item>
+                </el-col>
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div>
+                <div class="clearfix">
+                  <div class="base-header">
+                    <span>重量信息</span>
+                  </div>
+
+                  <el-col :span="24">
+                    <el-form-item label="毛重" size="small">
+                      <el-input v-model="value"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="净重" size="small">
+                      <el-input v-model="value"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="重量单位" size="small">
+                      <el-input v-model="value"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </div>
+
+                <div class="clearfix">
+                  <div class="base-header">
+                    <span>尺寸信息</span>
+                  </div>
+
+                  <el-col :span="24">
+                    <el-form-item label="长" size="small">
+                      <el-input v-model="detail.length"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="宽" size="small">
+                      <el-input v-model="detail.width"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="高" size="small">
+                      <el-input v-model="detail.height"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="体积" size="small">
+                      <el-input v-model="detail.volume"></el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="24">
+                    <el-form-item label="尺寸单位" size="small">
+                      <el-input v-model="detail.volume"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </div>
+
+                <div class="clearfix">
+                  <div class="base-header">
+                    <span>状态</span>
+                  </div>
+                  <el-col :span="24">
+                    <el-form-item label="数据状态" size="small">
+                      <el-select v-model="value">
+                        <el-option label="普通仓库"> </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="禁用状态" size="small">
+                      <el-select v-model="value">
+                        <el-option label="普通仓库"> </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="已使用" size="small">
+                      <el-select v-model="value">
+                        <el-option label="普通仓库"> </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </div>
+              </div>
+            </el-col>
+          </el-row>
         </div>
       </el-card>
       <el-card class="box-card">
@@ -300,43 +310,67 @@
             </div>
             <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-select v-model="value">
+                        <el-option label="普通仓库"> </el-option>
+                      </el-select>
+                    </el-form-item>
+
+             </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-form-item label="换算方向" size="small">
+                      <el-select v-model="value">
+                        <el-option label="普通仓库"> </el-option>
+                      </el-select>
+                    </el-form-item>
+
+              </el-col
               >
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r color">仓库</span><input type="text" />
+                >
+                     <el-form-item label="仓库" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">仓位</span><input type="text" />
+                >
+                  <el-form-item label="仓位" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r color">单箱标准数量</span
-                ><input type="text"
-              /></el-col>
+                >
+                 <el-form-item label="单箱标准数量" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+                </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-form-item label="可锁库" size="small">
+                    <el-checkbox v-model="value" label="" ></el-checkbox>
+                  </el-form-item>
+               </el-col>
             </el-row>
           </div>
           <div>
@@ -345,54 +379,93 @@
             </div>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">启用批号管理</span><input type="text"
-              /></el-col>
+                >
+                      <el-form-item label="启用批号管理" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">批号编码规则</span><input type="text"
-              /></el-col>
+                >
+                    <el-form-item label="批号编码规则" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">启用保质期管理</span><input type="text"
-              /></el-col>
+                >
+
+                 <el-form-item label="启用保质期管理" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">批号附属信息</span><input type="text"
-              /></el-col>
+                >
+                   <el-form-item label="批号附属信息" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+              </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-form-item label="保质期单位" size="small">
+                      <el-select v-model="value">
+                        <el-option label="普通仓库"> </el-option>
+                      </el-select>
+                    </el-form-item>
+
+              </el-col
               >
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">在架寿命期</span><input type="text"
-              /></el-col>
+                >
+
+                 <el-form-item label="在架寿命期" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+              </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-form-item label="参考成本" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">成本单位</span><input type="text"
-              /></el-col>
+                >
+                  <el-form-item label="成本单位" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">币别</span><input type="text"
-              /></el-col>
+                >
+                      <el-form-item label="币别" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
+               </el-col>
             </el-row>
           </div>
           <div>
@@ -401,34 +474,66 @@
             </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-form-item label="启用" size="small">
+                  </el-form-item>
+                  <el-form-item label="最小库存预警" size="small">
+                    <el-checkbox v-model="value" label="" ></el-checkbox>
+                  </el-form-item>
+                   <el-form-item label="安全库存预警" size="small">
+                    <el-checkbox v-model="value" label="" ></el-checkbox>
+                  </el-form-item>
+                   <el-form-item label="最大库存预警" size="small">
+                    <el-checkbox v-model="value" label="" ></el-checkbox>
+                  </el-form-item>
+                   <el-form-item label="在订货点预警" size="small">
+                    <el-checkbox v-model="value" label="" ></el-checkbox>
+                  </el-form-item>
+
               </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">最小库存</span><input type="text"
-              /></el-col>
+                >
+                 <el-form-item label="最小库存" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
+                </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">再定货点</span><input type="text"
-              /></el-col>
+                >
+                  <el-form-item label="再定货点" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
+
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">经济订货批量</span><input type="text"
-              /></el-col>
+                >
+                      <el-form-item label="经济订货批量" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
+
+              </el-col>
             </el-row>
             <el-row>
               <el-col :span="24"
-                ><span class="marg-r">最大库存</span><input type="text"
-              /></el-col>
+                >
+                      <el-form-item label="最大库存" size="small">
+                <el-input v-model="value" ></el-input>
+
+                  </el-form-item>
+
+
+              </el-col>
             </el-row>
           </div>
         </div>
@@ -436,7 +541,7 @@
           <div class="base-header">
             <span>客机信息</span>
           </div>
-          <!-- 列表 -->
+
           <br />
           <el-table
             v-loading="listLoading"
@@ -515,10 +620,11 @@
           <br />
           <el-row>
             <el-col :span="6">
-              <strong class="marg-r">商城分类</strong>
-              <select name="" id="" class="selectStyle2">
-                <option value="">挂式空调</option>
-              </select>
+                <el-form-item label="商城分类" size="small">
+                      <el-select v-model="value">
+                        <el-option label="挂式空调"> </el-option>
+                      </el-select>
+                    </el-form-item>
             </el-col>
           </el-row>
           <div>
@@ -549,16 +655,18 @@
           <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-form-item label="是否允许订货" size="small">
+                      <el-select v-model="value">
+                        <el-option label="是"> </el-option>
+                        <el-option label="否"> </el-option>
+                      </el-select>
+                    </el-form-item>
+
             </el-col>
           </el-row>
-          <br />
-          <br />
-          <el-button type="info">保存</el-button>
+
+
+          <el-button >保存</el-button>
         </div>
       </el-card>
     </el-form>
@@ -686,4 +794,7 @@ export default {
     margin-bottom: 0;
   }
 }
+::v-deep .el-select{
+  width: 100%;
+}
 </style>

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

@@ -27,7 +27,7 @@
                 placeholder="请选择调价业务员"
                 filterable
                 @change="handleUser"
-                v-model="operatorId"
+                v-model="serviceId"
               >
                 <el-option
                   v-for="(item, index) in userList"
@@ -131,12 +131,13 @@
               align="center"
               label="存货编码"
               prop="materialNumber"
+
               min-width="160"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.materialNumber"></el-input>
+                  <el-input disabled v-model="scope.row.materialNumber"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -149,7 +150,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.materialName"></el-input>
+                  <el-input disabled v-model="scope.row.materialName"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -162,7 +163,7 @@
             >
               <template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.specification"></el-input>
+                  <el-input disabled v-model="scope.row.specification"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -195,12 +196,12 @@
             <el-table-column
               align="center"
               label="格力折扣"
-              prop="retailPrice"
+              prop="discAmount"
               min-width="160"
               show-overflow-tooltip
               ><template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.retailPrice"></el-input>
+                  <el-input v-model="scope.row.discAmount"></el-input>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -212,7 +213,19 @@
               show-overflow-tooltip
               ><template slot-scope="scope">
                 <el-form-item>
-                  <el-input v-model="scope.row.rebateUseRate"></el-input>
+                  <el-select
+                    v-model="scope.row.walletRebateId"
+                    placeholder="请选择返利类型"
+                    @change="handelRebateList($event, scope.$index)"
+                  >
+                    <el-option
+                      v-for="(item, index) in rebateList"
+                      :key="item.index"
+                      :value="item.walletRebateId"
+                      :label="item.name"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
               </template>
             </el-table-column>
@@ -301,9 +314,9 @@
                     placeholder="请选择现金钱包"
                   >
                     <el-option
-                      v-for="item in scope.row.rebateList"
-                      :key="item.walletRebateId"
-                      :value="item.walletRebateId"
+                      v-for="item in walleList"
+                      :key="item.id"
+                      :value="item.id"
                       :label="item.name"
                     >
                     </el-option>
@@ -636,7 +649,7 @@
         style="float: right"
         type="primary"
         size="small"
-        @click="(centerDialogVisible = true), handleDataList()"
+        @click="centerDialogVisible = true"
         >添加</el-button
       >
     </div>
@@ -665,7 +678,7 @@
                 <el-button size="small" @click="resetScreenForm"
                   >清空</el-button
                 >
-                <el-button size="small" type="primary" @click="handleDataList"
+                <el-button size="small" type="primary" @click="submitScreenForm"
                   >搜索</el-button
                 >
               </el-form-item>
@@ -768,10 +781,10 @@
           </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>
+      <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>
@@ -785,6 +798,7 @@ import {
   getRebate,
   getUserList,
   getMaterialDetail,
+  getWalletList,
 } from "@/api/basic_data/material";
 
 import MaterialListDetail from "./material_list-detail.vue";
@@ -803,8 +817,8 @@ export default {
         examineResult: true,
         examineStatus: "",
         id: null,
-        operatorId: "",
-        operatorName: "",
+        serviceId: "",
+        serviceName: "",
         remark: "",
         saleTypeId: "",
       },
@@ -815,9 +829,9 @@ export default {
       rebateList: [],
       typeList: [],
       saleTypeId: "",
-      operatorId: "",
+      serviceId: "",
       adminCompanyId: "",
-      operatorName: "",
+      serviceName: "",
       adminCompanyName: "",
       adminWebsitId: "",
       remark: "",
@@ -829,7 +843,8 @@ export default {
       dialogForm: {
         keyword: "",
       },
-      selectData:[]
+      selectData: [],
+      walleList: [],
     };
   },
   mounted() {
@@ -852,21 +867,42 @@ export default {
       status: "",
       userName: "",
     }).then((res) => {
-      console.log(res, "bumeng");
       this.userList = res.data.records;
     });
+    getWalletList({ mainId: "", walletName: "" }).then((res) => {
+      this.walleList = res.data;
+    });
+    let rebateParams = {
+      pageNum: 1,
+      pageSize: -1,
+      mainName: "",
+      saleTypeCode: "",
+      saleTypeName: "",
+      status: "",
+    };
+    getRebate(rebateParams).then((res) => {
+      this.rebateList = res.data.records;
+    });
   },
   methods: {
     handelWallets(e, index) {
-      this.items[index].wallets = [
-        {
-          billId: "",
-          id: "",
-          mainId: "",
-          parentId: "",
-          parentItemId: e,
-        },
-      ];
+      let obj =  {
+         	"billId": "",
+					"id": "",
+					"parentId": "",
+					"parentItemId": "",
+					"walletRebateId": e
+        }
+
+      this.$set(this.items[index], "wallets", [...this.items[index].wallets,obj]);
+    },
+    handelRebateList(e, index) {
+      const reabteData = this.rebateList.filter((k) => {
+        return k.walletRebateId == e;
+      })[0];
+      this.$set(this.items[index], "walletRebateName", reabteData.name);
+      this.$set(this.items[index], "walletRebateId", reabteData.walletRebateId);
+      this.$set(this.items[index], "rebateRate", reabteData.rebateRate);
     },
     handleUser(e) {
       const adminCompany = this.userList.filter((k) => {
@@ -874,8 +910,8 @@ export default {
       })[0];
       this.adminWebsitId = adminCompany.adminUserId;
       this.adminCompanyName = adminCompany.adminCompanyName;
-      this.operatorName = adminCompany.roleName;
-      this.operatorId = adminCompany.roleId;
+      this.serviceName = adminCompany.nickName || 'd';
+      this.serviceId = adminCompany.roleId;
     },
     goBack() {
       this.$parent.show = 1;
@@ -888,72 +924,64 @@ export default {
     hanleDeleInd(index) {
       this.items.splice(index, 1);
     },
-    handleDetermine(){
+    handleDetermine() {
       if (this.selectData.length) {
+        for (let i = 0; i < this.selectData.length; i++) {
+          this.items.push({
+            baseUnitId: "",
+            batchPrice: "",
+            billId: "",
+            endDate: "",
+            isPromote: "",
+            isPublish: "",
+            materialId: this.selectData[i].id,
+            materialName: this.selectData[i].name,
+            materialNumber: this.selectData[i].number,
+            discAmount: "",
+            materialOldNumber: this.selectData[i].oldNumber,
+            parentId: "",
+            walletRebateName: "",
+            walletRebateId: "",
+            rebateRate: "",
+            qty: "",
+            rebateUseRate: "",
+            retailPrice: ""||0,
+            saleTypeId: "",
+            specification: this.selectData[i].specification,
+            startDate: this.selectData[i].startDate,
+            wallets: [
 
-          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('请选择内容')
+            ],
+            rebateList: [...this.rebateList],
+            isPublishArr: [
+              {
+                value: "是",
+                bool: 1,
+              },
+              {
+                value: "否",
+                bool: 0,
+              },
+            ],
+            isPromoteArr: [
+              {
+                value: "是",
+                bool: 1,
+              },
+              {
+                value: "否",
+                bool: 0,
+              },
+            ],
+          });
+        }
+        // console.log(this.items);
+        this.centerDialogVisible = false;
+      } else {
+        this.$errorMsg("请选择内容");
       }
-
     },
     getMaterialList() {
-      let rebateParams = {
-        pageNum: 1,
-        pageSize: 10,
-        mainName: "",
-        saleTypeCode: "",
-        saleTypeName: "",
-        status: 1,
-      };
-      getRebate(rebateParams).then((res) => {
-        this.rebateList = res.data.records;
-        console.log(this.rebateList, "this.rebateList");
-      });
       let params = {
         pageNum: 1,
         pageSize: 10,
@@ -964,20 +992,19 @@ export default {
       });
     },
     handleSelectionAllChange(e) {
-        this.selectData = e
+      this.selectData = e;
     },
     handleSelectionChange(e) {
-      this.selectData = e
+      this.selectData = e;
     },
     hanleAdd() {
       if (this.materialId) {
-
         this.centerDialogVisible = false;
       } else {
         this.$errorMsg("请选择产品");
       }
     },
-    handleDataList() {
+    getList() {
       this.listLoading = true;
       let params = {
         pageNum: this.currentPage,
@@ -991,75 +1018,89 @@ export default {
       });
     },
     hanleSbumit() {
+      for (let i = 0; i < this.items.length; i++) {
+
+          for (let j = i+1; j < this.items.length; j++) {
+
+              if (this.items[i].materialNumber==this.items[j].materialNumber) {
+                if (this.items[i].saleTypeId ==this.items[j].saleTypeId ) {
+                      this.$errorMsg('有存货编码销售类型相同')
+                return
+                }
+
+              }
+
+
+          }
+      }
       const params = {
         ...this.base,
         items: this.items,
         saleTypeId: this.saleTypeId,
         adminWebsitId: this.adminWebsitId,
-        operatorId: this.operatorId,
-      };
+        serviceId: this.serviceId,
+      adminCompanyName :this.adminCompanyName,
+      serviceName :this.nickName ,
+
+      }
       getProductRriceAdd(params).then((res) => {
-        this.items = {
-          baseUnitId: "32",
-          batchPrice: "23",
-          billId: "",
-          endDate: "",
-          id: null,
-          isPromote: "",
-          isPublish: "",
-          materialId: "",
-          materialName: "",
-          materialNumber: "",
-          parentId: "",
-          qty: "",
-          rebateUseRate: "",
-          retailPrice: "",
-          saleTypeId: "",
-          specification: "",
-          startDate: "",
-          wallets: [],
-          isPublishArr: [
-            {
-              value: "是",
-              bool: 1,
-            },
-            {
-              value: "否",
-              bool: 0,
-            },
-          ],
-          isPromoteArr: [
-            {
-              value: "是",
-              bool: 1,
-            },
-            {
-              value: "否",
-              bool: 0,
-            },
-          ],
-        };
-        this.base = {
-          adminCompanyId: "",
-          adminWebsitId: "",
-          billId: "",
-          examineNote: "",
-          examineResult: true,
-          examineStatus: "",
-          id: null,
-          operatorId: "",
-          operatorName: "",
-          remark: "",
-          saleTypeId: "",
-        };
+        // this.items = {
+        //   baseUnitId: "32",
+        //   batchPrice: "23",
+        //   billId: "",
+        //   endDate: "",
+        //   id: null,
+        //   isPromote: "",
+        //   isPublish: "",
+        //   materialId: "",
+        //   materialName: "",
+        //   materialNumber: "",
+        //   parentId: "",
+        //   qty: "",
+        //   rebateUseRate: "",
+        //   retailPrice: "",
+        //   saleTypeId: "",
+        //   specification: "",
+        //   startDate: "",
+        //   wallets: [],
+        //   isPublishArr: [
+        //     {
+        //       value: "是",
+        //       bool: 1,
+        //     },
+        //     {
+        //       value: "否",
+        //       bool: 0,
+        //     },
+        //   ],
+        //   isPromoteArr: [
+        //     {
+        //       value: "是",
+        //       bool: 1,
+        //     },
+        //     {
+        //       value: "否",
+        //       bool: 0,
+        //     },
+        //   ],
+        // };
+        // this.base = {
+        //   adminCompanyId: "",
+        //   adminWebsitId: "",
+        //   billId: "",
+        //   examineNote: "",
+        //   examineResult: true,
+        //   examineStatus: "",
+        //   id: null,
+        //   serviceId: "",
+        //   serviceName: "",
+        //   remark: "",
+        //   saleTypeId: "",
+        // };
         this.$successMsg("成功");
-        // getProductRriceDetail({ id: res.data }).then((res) => {
-        //   this.base = {
-        //     ...res.data,
-        //   };
-
-        //   this.detail = res.data.items;
-        // });
+        getProductRriceDetail({ id: res.data }).then((res) => {
+          this.base.billId = res.data.billId;
+        });
       });
     },
     handleReseat() {
@@ -1071,8 +1112,8 @@ export default {
         examineResult: true,
         examineStatus: "",
         id: null,
-        operatorId: "",
-        operatorName: "",
+        serviceId: "",
+        serviceName: "",
         remark: "",
         saleTypeId: "",
       };

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

@@ -25,7 +25,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="调价部门" prop="account">
-              <el-input placeholder="请输入" disabled></el-input>
+              <el-input placeholder="请输入" v-model="men"  disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -33,24 +33,16 @@
               <el-input
                 disabled
                 placeholder="请输入"
-                v-model="detail.operatorName"
+                v-model="ren"
               ></el-input>
             </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>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码" prop="operatorName">
               <el-input
                 disabled
                 placeholder="请输入"
-                v-model="detail.operatorName"
+                v-model="detail.remark"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -72,8 +64,10 @@
                 label="销售类型"
                 prop="saleTypeId"
                 min-width="160"
+                :formatter="formatterType"
                 show-overflow-tooltip
-              ></el-table-column>
+              >
+              </el-table-column>
               <el-table-column
                 align="center"
                 label="存货编码"
@@ -91,14 +85,14 @@
               <el-table-column
                 align="center"
                 label="规格型号"
-                prop="model"
+                prop="specification"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
               <el-table-column
                 align="center"
                 label="计量单位"
-                prop="company"
+                prop="baseUnitId"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
@@ -120,7 +114,7 @@
               <el-table-column
                 align="center"
                 label="返利使用比例"
-                prop="rebateUseRate"
+                prop="rebateRate"
                 min-width="160"
                 show-overflow-tooltip
               >
@@ -192,15 +186,15 @@
               <div class="label">审批结果</div>
               <div class="value">
                 <el-radio-group v-model="detail.examineResult">
-                  <el-radio :label="true">通过</el-radio>
-                  <el-radio :label="false">驳回</el-radio>
+                  <el-radio label="通过" :value="true"></el-radio>
+                  <el-radio label="驳回" :value="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">
-                <el-input v-model="detail.examineNote " size="small"></el-input>
+                <el-input v-model="detail.examineNote" size="small"></el-input>
               </div>
             </el-col>
           </el-row>
@@ -216,13 +210,13 @@
             > -->
           </div>
         </div>
-   </el-form>
+      </el-form>
     </div>
   </div>
 </template>
 
 <script>
-import { getProductRriceConfirm } from "@/api/basic_data/material";
+import { getProductRriceConfirm, getTypeList,getUserList } from "@/api/basic_data/material";
 import Mixin from "@/mixin/index";
 export default {
   // mixins: [Mixin],
@@ -252,19 +246,60 @@ export default {
           release: "是",
         },
       ],
+      typeList: [],
+      userList:[],
+      men:'',
+      ren:''
     };
   },
+
+  created() {
+    let params = {
+      pageNum: 1,
+      pageSize: -1,
+      saleCode: "",
+      saleName: "",
+      status: "",
+    };
+    getTypeList(params).then((res) => {
+      this.typeList = res.data.records;
+    });
+    getUserList({
+      pageNum: 1,
+      pageSize: -1,
+      adminWebsitId: "",
+      isCustomer: 0,
+      roleId: "",
+      status: "",
+      userName: "",
+    }).then((res) => {
+      this.userList = res.data.records;
+      var a= this.userList.filter(k=>{
+
+        return k.roleId == this.detail.serviceId
+      })[0]
+      this.men = a.adminCompanyName
+      this.ren = a.nickName
+    });
+  },
   methods: {
+    formatterType(row) {
+      return this.typeList.filter((k) => {
+        return k.id == row.saleTypeId;
+      })[0]?.saleName;
+    },
     goBack() {
       console.log(this.$parent);
       this.$parent.show = 1;
     },
     onSubmit() {
+
       const params = {
-        ...this.detail,
+        ...this.detail
+
       };
       getProductRriceConfirm(params).then((res) => {
-         this.$successMsg("已提交审核");
+        this.$successMsg("已提交审核");
       });
     },
     resetScreenForm() {

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

@@ -3,13 +3,11 @@
     <div>
       <el-page-header @back="goBack" content="详情"> </el-page-header>
     </div>
-    <br />
-    <br />
     <div>
       <el-form
         ref="screenForm"
         :model="detail"
-        label-width="70px"
+        label-width="120px"
         size="small"
         label-position="left"
       >
@@ -23,20 +21,10 @@
               ></el-input>
             </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-input placeholder="请输入"    v-model="men" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -44,35 +32,18 @@
               <el-input
                 disabled
                 placeholder="请输入"
-                v-model="detail.operatorName"
+                v-model="ren"
               ></el-input>
             </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>
-                <el-option label="区域二" value="beijing"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+
+
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码" prop="operatorName">
               <el-input
                 disabled
                 placeholder="请输入"
-                v-model="detail.operatorName"
+                v-model="detail.remark"
               ></el-input>
             </el-form-item>
           </el-col>
@@ -93,6 +64,7 @@
                 align="center"
                 label="销售类型"
                 prop="saleTypeId"
+                 :formatter="formatterType"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
@@ -113,14 +85,14 @@
               <el-table-column
                 align="center"
                 label="规格型号"
-                prop="model"
+                prop="specification"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
               <el-table-column
                 align="center"
                 label="计量单位"
-                prop="company"
+                prop="baseUnitId"
                 min-width="160"
                 show-overflow-tooltip
               ></el-table-column>
@@ -202,7 +174,7 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" 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="8" :lg="8" class="item">
           <div class="label">审批结果</div>
@@ -210,7 +182,7 @@
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">
           <div class="label">审批时间</div>
-          <div class="value">{{}}</div>
+          <div class="value">{{''}}</div>
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24" class="item">
           <div class="label">审批说明</div>
@@ -226,6 +198,8 @@
 
 
 <script>
+import { getProductRriceConfirm, getTypeList,getUserList } from "@/api/basic_data/material";
+
 export default {
   props:{
     detail:{
@@ -252,12 +226,48 @@ export default {
           release: "是",
         },
       ],
+       typeList: [],
+      userList:[],
+      men:'',
+      ren:''
     };
   },
   created() {
+    let params = {
+      pageNum: 1,
+      pageSize: -1,
+      saleCode: "",
+      saleName: "",
+      status: "",
+    };
       console.log(this.detail);
+       getTypeList(params).then((res) => {
+      this.typeList = res.data.records;
+    });
+    getUserList({
+      pageNum: 1,
+      pageSize: -1,
+      adminWebsitId: "",
+      isCustomer: 0,
+      roleId: "",
+      status: "",
+      userName: "",
+    }).then((res) => {
+      this.userList = res.data.records;
+      var a= this.userList.filter(k=>{
+
+        return k.roleId == this.detail.serviceId
+      })[0]
+      this.men = a.adminCompanyName
+      this.ren = a.nickName
+    });
   },
   methods: {
+       formatterType(row) {
+      return this.typeList.filter((k) => {
+        return k.id == row.saleTypeId;
+      })[0]?.saleName;
+    },
     goBack() {
       console.log(this.$parent);
       this.$parent.show = 1;

src/views/basic_data/material/machine_list.vue

@@ -30,7 +30,7 @@
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="编码" prop="number">
               <el-input
-                type="number"
+
                 placeholder="请输入编码"
                 v-model.number="screenForm.number"
               ></el-input>
@@ -258,16 +258,16 @@
           </el-select>
         </el-form-item>
         <el-form-item label="名称">
-          <el-input v-model="diaLogForm.name" size="normal"></el-input>
+          <el-input v-model="diaLogForm.name"   type="number" size="normal"></el-input>
         </el-form-item>
         <el-form-item label="型号">
-          <el-input v-model="diaLogForm.model" size="normal"></el-input>
+          <el-input v-model="diaLogForm.model"   type="number" size="normal"></el-input>
         </el-form-item>
         <el-form-item label="编码">
-          <el-input v-model="diaLogForm.number" size="normal"></el-input>
+          <el-input v-model="diaLogForm.number"    size="normal"></el-input>
         </el-form-item>
         <el-form-item label="体积">
-          <el-input v-model="diaLogForm.volume" size="normal"></el-input>
+          <el-input v-model="diaLogForm.volume"   type="number" size="normal"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/basic_data/material/modify_list.vue

@@ -100,7 +100,7 @@
             @select="hanleSelectAll"
             stripe
           >
-            <el-table-column type="selection" align="center"></el-table-column>
+            <el-table-column type="selection" align="center" width="50"></el-table-column>
             <el-table-column
               align="center"
               label="单据号"
@@ -119,6 +119,7 @@
               align="center"
               label="销售类型"
               prop="saleTypeId"
+                      :formatter="formatterType"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -153,7 +154,7 @@
             <el-table-column
               align="center"
               label="计量单位"
-              prop="company"
+              prop="baseUnitId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -317,6 +318,7 @@ import {
   getProductRriceDetail,
   getProductRriceList,
   getProductRricedel,
+  getTypeList
 } from "@/api/basic_data/material";
 import { downloadFiles } from "@/utils/util";
 export default {
@@ -376,6 +378,7 @@ export default {
         startDate: "",
         wallets: [],
       },
+      typeList:[]
     };
   },
   components: {
@@ -383,7 +386,28 @@ export default {
     ModifyListApproval,
     ModifyListDetail,
   },
+  mounted(){
+       let params = {
+      pageNum: 1,
+      pageSize: -1,
+      saleCode: "",
+      saleName: "",
+      status: "",
+    };
+   getTypeList(params).then((res) => {
+      this.typeList = res.data.records;
+    });
+  },
   methods: {
+  formatterType(row) {
+      for (let i = 0; i < this.typeList.length; i++) {
+
+     if (this.typeList[i].id == row.saleTypeId) {
+          return this.typeList[i].saleName
+     }
+
+      }
+    },
     addFn() {
       this.show = 2;
     },

src/views/sales_policy/components/AddCondition.vue

@@ -1,8 +1,7 @@
 <template>
   <el-container>
     <el-header height="50px" class="header">
-      <el-page-header @back="handleBack" content="详情页面">
-      </el-page-header>
+      <el-page-header @back="handleBack" content="详情页面"> </el-page-header>
     </el-header>
     <div class="line">
       <el-divider></el-divider>
@@ -20,16 +19,12 @@
             v-for="(item, index) in conditionBox"
             :key="index"
           >
-
             <el-row>
-
               <el-row class="pdt">
                 <el-button
                   type="primary"
                   size="small"
-
                   @click="(VisibleModle = true), getMaterialLists(index)"
-
                   >添加机型</el-button
                 >
 
@@ -68,30 +63,22 @@
             </el-row>
           </el-col>
         </el-row>
-        <el-row >
+        <el-row>
           <el-form label-width="120px" :inline="false" size="small">
             <el-row>
               <el-form-item label="配置比例设置"> </el-form-item>
             </el-row>
-       <el-col
-              :xs="24"
-              :sm="8"
-              :lg="8"
-
-            >
+            <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
-                <el-input
-                  size="small"
-                  v-model="limit"
-                ></el-input>
+                <el-input size="small" v-model="limit"></el-input>
               </el-form-item>
-              </el-col>
+            </el-col>
 
             <el-col
               :xs="24"
               :sm="8"
               :lg="8"
-              v-for="(len, index) in conditionBox.length-1"
+              v-for="(len, index) in conditionBox.length - 1"
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
@@ -116,16 +103,24 @@
             v-for="(item, index) in conditionBoxs"
             :key="index"
           >
-            <el-row >
-
+            <el-row>
               <el-row>
                 <el-table style="width: 100%" :data="item" border>
                   <el-table-column type="selection" width="55" align="center">
                   </el-table-column>
-                  <el-table-column label="货品名称" width="300" align="center" prop="materialName" >
+                  <el-table-column
+                    label="货品名称"
+                    width="300"
+                    align="center"
+                    prop="materialName"
+                  >
                     <template slot-scope="scope">{{ scope.row.date }}</template>
                   </el-table-column>
-                  <el-table-column prop="specification" label="规格型号" align="center">
+                  <el-table-column
+                    prop="specification"
+                    label="规格型号"
+                    align="center"
+                  >
                   </el-table-column>
                 </el-table>
               </el-row>
@@ -139,12 +134,21 @@
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
-                <el-input size="small"></el-input>
+                <el-input size="small" v-model="limit"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="8" :lg="8" v-for="len in conditionBoxs">
-              <el-form-item label="配提比例">
-                <el-input size="small"></el-input>
+
+            <el-col
+              :xs="24"
+              :sm="8"
+              :lg="8"
+              v-for="(len, index) in conditionBoxs.length - 1"
+            >
+              <el-form-item :label="'配提' + (index + 1) + '比例'">
+                <el-input
+                  size="small"
+                  v-model="popArr['line_' + index]"
+                ></el-input>
               </el-form-item>
             </el-col>
           </el-form>
@@ -175,7 +179,6 @@
     <el-dialog :visible.sync="VisibleModle" width="70%" center>
       <div>
         <el-container>
-
           <el-header height="">
             <el-form label-width="0" :inline="false" size="small">
               <el-col :xs="24" :sm="8" :lg="8" :offset="0">
@@ -367,11 +370,10 @@ import {
 } from "@/api/supply/sales";
 import TabelTransfer from "./TabelTransfer.vue";
 
-import { mapState} from "vuex";
+import { mapState } from "vuex";
 import AddModel from "./AddModel";
 import Minxin from "@/mixin";
 
-
 export default {
   mixins: [Minxin],
   props: {
@@ -420,42 +422,52 @@ export default {
       arrIndex: 0,
 
       popArr: {},
-
     };
   },
   created() {
     this.getCommonApi();
   },
-   computed: mapState({
+  computed: mapState({
     comCode: (state) => state.sales.code,
   }),
-    updated() {
-
-    },
+  updated() {},
   methods: {
-    getList() {
-
-    },
-    handleBack(){
-      if (this.$parent.isShow==10) {
-          this.$parent.isShow = 8
-      }else{
-        this.$parent.isCondition =0
+    getList() {},
+    handleBack() {
+      if (this.$parent.isShow == 10) {
+        this.$parent.isShow = 8;
+      } else {
+        this.$parent.isCondition = 0;
       }
-
     },
     getCommonApi() {
       if (this.id) {
         var i = 1;
         getConditionMaterialDetail({ id: this.id }).then((res) => {
-          this.pop = res.data;
-          while (i <= 2) {
-            getConditionMaterialList({pageNum:1,pageSize:10,policyConditionId:this.id,popType:i}).then((res) => {
-                this.conditionBoxs = res.data.records
-              i++;
-            });
+          console.log(res.data,'id');
+          this.pop = res.data ? res.data.pop:''
+          if (res.data && res.data.pop) {
+            let pop = res.data.pop.split(":");
+            for (let i = 0; i < pop.length; i++) {
+              if (i == 0) {
+                this.limit = pop[i];
+                return;
+              }
+              this.popArr["line_" + i] = pop[i];
+            }
+            while (i <= 2) {
+              getConditionMaterialList({
+                pageNum: 1,
+                pageSize: -1,
+                policyConditionId: this.id,
+                popType: i,
+              }).then((res) => {
+                this.conditionBoxs.push(res.data.records);
+                i++;
+              });
 
-            i++;
+              i++;
+            }
           }
         });
       }
@@ -477,9 +489,9 @@ export default {
       for (let i = 0; i < this.conditionBox.length; i++) {
         for (let j = 0; j < this.conditionBox[i].length; j++) {
           this.conditionBox[i][j].popType = i + 1;
-               this.conditionBox[i][j].policyId = this.comCode
-               this.conditionBox[i][j].id = ''
-                  //  this.conditionBox[i][j].policyMaterialId =this.conditionBox[i][j].materialId
+          this.conditionBox[i][j].policyId = this.comCode;
+          this.conditionBox[i][j].id = "";
+          //  this.conditionBox[i][j].policyMaterialId =this.conditionBox[i][j].materialId
         }
         tableData = [...tableData, ...this.conditionBox[i]];
       }
@@ -489,7 +501,6 @@ export default {
       }
       var pop = [this.limit];
       for (const key in this.popArr) {
-
         pop.push(this.popArr[key]);
       }
       console.log(pop.join(":"));
@@ -502,11 +513,10 @@ export default {
       };
       addPoliyCondition(params).then((res) => {
         this.$successMsg("添加成功");
-        this.$parent.isCondition = 0
-        this.$parent.isFlag = 1
-        this.$emit('handleSubmitCon',this.comCode)
+        this.$parent.isCondition = 0;
+        this.$parent.isFlag = 1;
+        this.$emit("handleSubmitCon", this.comCode);
       });
-
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
@@ -566,7 +576,6 @@ export default {
       this.conditList2 = this.leftData;
 
       this.leftData = [];
-
     },
     handleAllDelete() {
       this.conditList2 = [];
@@ -594,14 +603,12 @@ export default {
               ...this.conditList2,
 
               ...this.conditionBox[i],
-
             ]);
             console.log(this.conditionBox);
           }
         }
         this.VisibleModle = false;
         this.conditList2 = [];
-
       } else {
         this.$errorMsg("请选择内容");
       }

src/views/sales_policy/components/Examine.vue

@@ -217,7 +217,7 @@
           >
           </el-pagination>
         </div>
-        <div class="descriptions" v-if="$parent.isShow == 8  && detail.examineStatus == 'SAVE'">
+        <div class="descriptions" v-if="$parent.isShow == 8  && detail.examineStatus == 'WAIT'">
           <el-row>
             <el-col :span="6">审核人</el-col>
             <el-col :span="6">{{$store.getters.name}}</el-col>
@@ -233,11 +233,9 @@
           </el-row>
           <el-row>
             <el-col :span="4">审批说明</el-col>
-            <el-col :span="20" class="col" style="padding: 0">
+            <el-col :span="20" class="col value" style="padding: 0" >
               <el-input
-
-                  size="small"
-
+                size="small"
                 placeholder="请输入内容"
                 v-model="remark"
               >
@@ -398,8 +396,19 @@ export default {
 .col {
   height: 100px;
 }
-.el-input.is-active .el-input__inner, .el-input__inner:focus {
-    border-color: #fff;
-    outline: 0;
+
+::v-deep .enterpriseName .el-input__inner {
+    width:100%;
+    background-color: #e8e8e8;
+    text-align: center;
+    border-color: #c0c4cc;
+    color:#000
+}
+::v-deep .el-input--small .el-input__inner{
+  height: 40px;
+  border: none;
+}
+::v-deep.el-input__inner:focus{
+      border-color:#fff !important;
 }
 </style>

src/views/sales_policy/policy_list.vue

@@ -181,6 +181,7 @@
             >
             <el-button
               type="text"
+                 v-if="scope.row.examineStatus=='WAIT'"
               @click="
                 (isShow = 8), (id = scope.row.id), (code = scope.row.code)
               "
@@ -189,6 +190,7 @@
             >
             <!-- </el-popconfirm> -->
             <el-popconfirm
+            v-if="scope.row.examineStatus=='SAVE'"
               style="margin-left: 10px"
               title="提审？"
               @onConfirm="handlesubmit(scope.row)"
@@ -216,6 +218,15 @@
 
           </template>
         </el-table-column>
+        <el-table-column label="状态" width="120" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.examineStatus == 'SAVE'">保存</el-tag>
+            <el-tag v-else-if="scope.row.examineStatus == 'WAIT'">待审核 </el-tag>
+              <el-tag v-else-if="scope.row.examineStatus == 'OK'">通过 </el-tag>
+                <el-tag v-else>不通过 </el-tag>
+
+          </template>
+        </el-table-column>
         <el-table-column
           prop="code"
           label="销售政策编号"
@@ -291,7 +302,7 @@
     </div>
   </div>
   <AddPolicy v-else-if="isShow == 2" />
-  <!-- <AddCondition v-else-if="isShow == 3 || isShow == 6" :id="id" /> -->
+  <AddCondition v-else-if="isShow == 10 " :id="id" />
   <Examine v-else />
 </template>
 

src/views/sales_rebate/rebate_list.vue

@@ -238,7 +238,7 @@ export default {
         mainName: "",
         saleTypeCode: "",
         saleTypeName: "",
-        status: true,
+        status: '',
       },
       dialogForm: {
         name: "",
@@ -247,7 +247,7 @@ export default {
         saleTypeCode: "",
         saleTypeName: "",
         rabateRate: "",
-        status: true,
+        status: '',
       },
       dataList: [],
       columns: [
@@ -298,6 +298,10 @@ export default {
         },
       ],
       options: [
+         {
+          value: '',
+          label: "状态",
+        },
         {
           value: true,
           label: "已启用",
@@ -424,4 +428,8 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+
+.el-switch.is-disabled {
+  opacity: inherit;
+}</style>

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

@@ -275,7 +275,7 @@
           <template slot-scope="scope">
             {{
               (scope.row.price * scope.row.qty * (scope.row.rebateRate * 100)) /
-              100
+              100 || 0
             }}
           </template>
         </el-table-column>
@@ -329,7 +329,7 @@
                   100) *
                   100 -
                 ((scope.row.qty * (scope.row.discAmount * 100)) / 100) * 100) /
-              100
+              100 || 0
             }}
           </template>
         </el-table-column>
@@ -373,32 +373,14 @@
           min-width="100"
           show-overflow-tooltip
         ></el-table-column>
-        <el-table-column
-          align="center"
-          label="总仓库"
-          prop="status1"
-          min-width="100"
-          show-overflow-tooltip
-          v-if="!listItem"
-        >
+        <el-table-column align="center" label="总仓库" prop="status1" min-width="100" show-overflow-tooltip v-if="!listItem">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.status1 | statusTagFilter">{{
-              scope.row.status1 | statusFilter
-            }}</el-tag>
+            <div>{{ scope.row.status1 | status1Filter }}</div>
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="仓库状态"
-          prop="status2"
-          min-width="100"
-          show-overflow-tooltip
-          v-if="!listItem"
-        >
+        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip v-if="!listItem">
           <template slot-scope="scope">
-            <el-tag :type="scope.row.status2 | statusTagFilter">{{
-              scope.row.status2 | statusFilter
-            }}</el-tag>
+            <div>{{ status2Filter(scope.row) }}</div>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
@@ -699,22 +681,14 @@ export default {
   componentName: "RetailForm",
   props: ["listItem"],
   filters: {
-    statusFilter(val) {
-      if (val === "") return "未检查";
-      const MAP = {
-        0: "库存不足",
-        1: "库存充足",
-      };
-      return MAP[val];
-    },
-    statusTagFilter(val) {
-      if (val === "") return "info";
-      const MAP = {
-        0: "danger",
-        1: "success",
-      };
-      return MAP[val];
+     status1Filter(val) {
+      if (val === '' || val === null || val === undefined) return '未检查';
+      else if (val === 0) return '无货';
+      else if (val > 0 && val <= 30) return val;
+      else if (val > 30 && val <= 1000) return '有货';
+      else if (val > 1000) return '充足';
     },
+
   },
   data() {
     return {
@@ -818,6 +792,7 @@ export default {
     },
     comxjWalletList(){
       return (c)=>{
+        console.log(c);
           const walle =[]
           const ovalVall = c == undefined || !c.length ? []: c
           for (let i = 0; i < this.xjWalletList.length; i++) {
@@ -846,6 +821,7 @@ export default {
   },
 
   methods: {
+
     // 返回列表
     goBack() {
       this.$emit("backListFormDetail");
@@ -945,6 +921,7 @@ export default {
         type: "REBATE",
       }).then((res) => {
         this.flWalletList = res.data;
+        console.log(this.flWalletList,'xxccc');
       });
     },
 
@@ -1083,7 +1060,9 @@ export default {
           policyId: params[1],
         }).then((res) => {
           this.pop = res.data.pop;
-          this.popArr = res.data.pop.split(":");
+          this.popArr = res.data.pop.split(":")
+          this.popArr.splice(0,1);
+          console.log
           for (let i = 0; i < this.popArr.length; i++) {
             this.$set(this.radioObj, "radio" + (i + 1), "");
           }
@@ -1127,6 +1106,22 @@ export default {
             }
           }
         }
+
+             const params = this.radio.split("&");
+            let arr = []
+          for (let k = 0; k < this.dataList.length; k++) {
+
+            if (this.dataList[k].policyId==params[1]) {
+              arr = [this.dataList[k]]
+            }
+
+        }
+           this.goodsList = [...arr,...this.goodsList]
+            this.goodsList.forEach((item) => {
+              this.$set(item,'status1','')
+             this.$set(item,'status2','')
+
+        });
         this.cusIndex = 0;
         this.radio = ''
         this.dataList = []
@@ -1155,29 +1150,35 @@ export default {
 
     // 检查库存
     checkStock() {
-      if (!this.warehouseValue) {
-        return this.$errorMsg("请选择仓库");
+       if(!this.warehouseValue) {
+        return this.$errorMsg('请选择仓库');
       }
-      if (!this.goodsList) {
-        return this.$errorMsg("请添加货品");
+      if(!this.goodsList) {
+        return this.$errorMsg('请添加货品');
       }
       let ids = [];
-      this.goodsList.forEach((item) => {
+      this.goodsList.forEach(item => {
         ids.push(item.materialId);
-      });
+      })
       checkStock({
         correspondId: this.warehouseValue,
-        materialId: ids.join(","),
-      }).then((res) => {
-        if (res.data) {
+        materialId: ids.join(',')
+      }).then(res => {
+        if(res.data) {
           this.goodsList.forEach((item, index) => {
-            item.status1 = res.data[index].allStockStatus;
-            item.status2 = res.data[index].stockStatus;
-          });
+           item.status1 = res.data[index].allStockNum;
+            item.status2 = res.data[index].stockNum;
+            console.log(item.status1,item.status2);
+          })
+
         }
-      });
+      })
+    },
+   status2Filter(item) {
+      if (item.status2 === '' || item.status2 === null || item.status2 === undefined) return '未检查';
+      else if (item.status2 >= item.qty) return '可用';
+      else return '短缺';
     },
-
     // 保存
     clickSubmitForm() {
       this.$refs.mainForm.validate((valid) => {

src/views/supply/policy/policy_list.vue

@@ -542,7 +542,7 @@ export default {
     // 进入表单
     toForm(item) {
       this.queryItem = item;
-      console.log(item, 99999);
+
       this.isShowForm = true;
     },