调整押金

src/api/supply/policy.js

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

src/layout/components/Sidebar/SidebarItem.vue

@@ -2,7 +2,7 @@
   <div v-if="!item.hidden">
     <!-- <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren) && !item.alwaysShow"> -->
     <template v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren || (onlyOneChild.children && onlyOneChild.children.length < 1 && (onlyOneChild.name == 'issue_index' || onlyOneChild.name == 'notice_index' || onlyOneChild.name == 'dashboard'))) && !item.alwaysShow">
-      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path ,onlyOneChild)">
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
         <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
           <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
         </el-menu-item>
@@ -13,7 +13,6 @@
       <template slot="title">
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
-
       <sidebar-item
         v-for="child in item.children"
         :key="child.path"
@@ -22,7 +21,6 @@
         :base-path="resolvePath(child.path)"
         class="nest-menu"
       />
-
     </el-submenu>
   </div>
 </template>
@@ -92,15 +90,12 @@ export default {
       return false
     },
     resolvePath(routePath) {
-
       if (isExternal(routePath)) {
         return routePath
       }
       if (isExternal(this.basePath)) {
         return this.basePath
       }
-
-
       return path.resolve(this.basePath, routePath)
     }
   }

src/layout/components/Sidebar/index.vue

@@ -12,6 +12,7 @@
         :collapse-transition="false"
         mode="vertical"
       >
+
         <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>
     </el-scrollbar>
@@ -39,6 +40,7 @@ export default {
       const route = this.$route
       console.log(route);
       const { meta, path ,fullUrl} = route
+      console.log(fullUrl,'kllk',this.routes);
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
         return meta.activeMenu

src/permission.js

@@ -49,6 +49,7 @@ router.beforeEach(async (to, from, next) => {
           for (var route of store.getters.menus) {
 
             const item = buildRootRoute(route);
+            // console.log(item,'456454');
             newRoutes.push(item);
           }
           // newRoutes.shift();
@@ -133,7 +134,7 @@ router.afterEach(() => {
 
 function buildRootRoute(route) {
   // console.log(route,1111);
-  const { url, icon, moduleName, moduleId, code, type } = route;
+  const { url, icon, moduleName, moduleId, code, type,fullUrl  } = route;
   var item = {};
   item.path = url;
   item.component = Layout;
@@ -189,7 +190,7 @@ function buildRootRoute(route) {
 
     for (var child of route.children) {
 
-      item.children.push(buildRoute(child, url));
+      item.children.push(buildRoute(child, fullUrl));
     }
   }
   return item;

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

@@ -274,7 +274,7 @@
       </div>
     </div>
     <div v-show="engineering == '工程订单信息'">
-      <h3>订单信息</h3>
+      <h3>工程订单信息</h3>
       <el-divider></el-divider>
       <!-- 列表 -->
       <div class="mymain-container">
@@ -342,7 +342,7 @@
       </div>
     </div>
     <div v-show="engineering == '工程发货信息'">
-      <h3>发货单信息</h3>
+      <h3>工程发货信息</h3>
       <el-divider></el-divider>
       <!-- 列表 -->
       <div class="mymain-container">
@@ -416,6 +416,185 @@
         </div>
       </div>
     </div>
+    <div v-show="">
+
+      <el-form
+        ref="deliverForm"
+        :model="deliverForm"
+        :rules="deliverFormRules"
+        label-width="80px"
+        size="small"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="8" :sm="8" :lg="8" style="height: 51px">
+            <el-form-item label="发货日期" prop="date">
+              <el-date-picker
+                v-model="deliverForm.date"
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 100%"
+                placeholder="选择日期"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="8" :sm="8" :lg="8">
+            <el-form-item label="发货仓库" prop="warehouse">
+              <el-select
+                v-model="deliverForm.warehouse"
+                placeholder="请选择发货仓库"
+                style="width: 100%"
+                filterable
+                @change="changeWarehouse"
+              >
+                <el-option
+                  v-for="item in warehouseList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="8" :sm="8" :lg="8">
+            <el-form-item label="选择仓位" prop="position">
+              <el-select
+                v-model="deliverForm.position"
+                placeholder="请选择仓位"
+                style="width: 100%"
+                filterable
+              >
+                <el-option
+                  v-for="item in positionList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div class="table" style="margin-top: 20px">
+        <el-table
+          :data="goodsList"
+          element-loading-text="Loading"
+          border
+          fit
+          highlight-current-row
+          stripe
+          max-height="400"
+        >
+          <el-table-column
+            align="center"
+            label="序号"
+            type="index"
+            width="50"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品编码"
+            prop="materialCode"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="产品名称"
+            prop="materialName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="规格型号"
+            prop="specification"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="单位"
+            prop="unit"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="订单数量"
+            prop="refundableQty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="发货数量"
+            prop="hasSendQty"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="直调数量"
+            prop="adjustNum"
+            min-width="100"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-input
+                v-model="scope.row.adjustNum"
+                size="small"
+                type="number"
+                :disabled="!scope.row.isDirectTransfer"
+              ></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="单价"
+            prop="price"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="金额"
+            prop="totalAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            label="返利"
+            prop="payRebateAmount"
+            min-width="100"
+            show-overflow-tooltip
+          ></el-table-column>
+
+          <el-table-column
+            align="center"
+            label="备注"
+            prop="remark"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column>
+        </el-table>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <!-- <el-button @click="closeDeliverDialog">取 消</el-button> -->
+        <!-- <el-button type="primary" @click="submitDeliverForm">确 定</el-button> -->
+      </span>
+
+    </div>
   </div>
 </template>
 
@@ -434,6 +613,23 @@ export default {
       dataList: [],
       projectList: [],
       details: {},
+      goodsList:[],
+      deliverForm: {
+        date: "",
+        warehouse: "",
+        position: "",
+      },
+      deliverFormRules: {
+        date: [
+          { required: true, message: "请选择发货日期", trigger: "change" },
+        ],
+        warehouse: [
+          { required: true, message: "请选择发货仓库", trigger: "change" },
+        ],
+        position: [
+          { required: true, message: "请选择仓位", trigger: "change" },
+        ],
+      },
     };
   },
   created() {
@@ -446,7 +642,7 @@ export default {
           this.details = res.data;
         });
       } else if (this.engineering == "工程订单信息") {
-        geOrderInfo({ refEnginRecordNo: this.$parent.refEnginRecordNo }).then(
+        geOrderInfo({ refEnginRecordNo: this.$parent.refEnginRecordNo,examineStatus:'OK' }).then(
           (res) => {
             this.dataList = res.data;
           }
@@ -456,6 +652,7 @@ export default {
           pageSize: -1,
           pageNum: 1,
           refEnginRecordNo: this.$parent.refEnginRecordNo,
+          examineStatus:'OK'
         }).then((res) => {
           this.projectList = res.data.records;
         });
@@ -478,6 +675,7 @@ export default {
     handleReset() {
       this.$refs.form.resetFields();
     },
+
   },
 };
 </script>

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

@@ -53,10 +53,10 @@
           </el-form-item>
         </el-col>
         <!-- <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="产品大类" prop="type">
+          <el-form-item label="业务员" prop="type">
             <el-select
               v-model="mainForm.type"
-              placeholder="选择产品大类"
+              placeholder="选择业务员"
               style="width: 100%"
             >
               <el-option
@@ -651,6 +651,7 @@ import {
   policyList,
   checkStock,
   typeList,
+  getUserList,
   getpolicyList,
   getConditionList,
   getConditionDetail,
@@ -766,7 +767,8 @@ export default {
       multipleData: [],
       disabled: false,
       cid: "",
-      newDataList:[]
+      newDataList:[],
+      userList:[]
     };
   },
 
@@ -825,12 +827,26 @@ export default {
     this.getWalletList();
     this.getWarehouseList();
     this.getTypeList();
+    this.getUserList()
     if (this.listItem) {
       this.getDetail();
     }
   },
   beforeUpdate() {},
   methods: {
+    getUserList(){
+      getUserList({
+        pageNum:1,
+        pageSize:-1,
+        adminWebsitId:'',
+        isCustomer:0,
+        roleId:'',
+        status:true,
+        userName:''
+      }).then(res=>{
+        this.userList = res.data.records
+      })
+    },
     // 返回列表
     goBack() {
       this.$emit("backListFormDetail");