1

src/views/stock/allot/index.vue

@@ -63,6 +63,9 @@
                     placeholder="出库仓库名称"
                   />
                 </el-col>
+
+                
+
                 <el-col :span="4" style="width: 76px; margin-left: 10px">
                   <el-button
                     style="width: 100%"
@@ -88,10 +91,7 @@
                   </el-button>
                 </el-col>
 
-                <el-col
-                  :span="4"
-                  style="width: 76px; margin-left: 20px"
-                >
+                <el-col :span="4" style="width: 76px; margin-left: 10px">
                   <el-button
                     style="width: 100%"
                     type="warning"
@@ -117,19 +117,6 @@
           ></el-tag>
         </template>
         <template #operation="{ scope }">
-          <!-- 重置密码 -->
-          <!-- <el-tooltip
-            v-if="powers.some((item) => item == '002')"
-            effect="dark"
-            content="重置密码"
-            placement="top"
-          >
-            <i
-              class="el-icon-refresh-left tb-icon"
-              @click="openPasswordModal(scope.row.id, false)"
-            ></i>
-          </el-tooltip> -->
-
           <el-tooltip
             v-if="powers.some((item) => item == '007')"
             effect="dark"
@@ -141,46 +128,6 @@
               @click="openModal(scope.row.id, true, scope.row)"
             ></i>
           </el-tooltip>
-          <!-- 修改 -->
-          <!-- <el-tooltip
-            v-if="powers.some((item) => item == '005')"
-            effect="dark"
-            content="修改"
-            placement="top"
-          >
-            <i
-              class="el-icon-edit tb-icon"
-              @click="openModal(scope.row.id, false, scope.row)"
-            ></i>
-          </el-tooltip> -->
-          <!-- 禁用 -->
-          <!-- <el-tooltip
-            v-if="
-              powers.some((item) => item == '004') && scope.row.status === '1'
-            "
-            effect="dark"
-            content="禁用"
-            placement="top"
-          >
-            <i
-              class="el-icon-video-pause tb-icon"
-              @click="statusConfirm(scope.row.id, scope.row.status)"
-            ></i>
-          </el-tooltip> -->
-          <!-- 启用 -->
-          <!-- <el-tooltip
-            v-if="
-              powers.some((item) => item == '004') && scope.row.status === '0'
-            "
-            effect="dark"
-            content="启用"
-            placement="top"
-          >
-            <i
-              class="el-icon-video-play tb-icon"
-              @click="statusConfirm(scope.row.id, scope.row.status)"
-            ></i>
-          </el-tooltip> -->
         </template>
       </ex-table>
       <add-edit
@@ -425,6 +372,11 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@media screen and (max-width: 1312px) {
+  .mr5 {
+    margin-top: 10px;
+  }
+}
 @media screen and (max-width: 1223px) {
   .mr10 {
     margin-top: 10px;

src/views/stock/allotFlow/components/goStock-audit.vue

@@ -13,20 +13,6 @@
         label-width="150px"
       >
         <el-form-item label="发货物流公司" prop="expressage_company">
-          <!-- <el-cascader
-            placeholder="请选择出库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="selectStock_go"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName();
-            "
-          ></el-cascader> -->
           <el-select
             v-model="value"
             placeholder="请选择发货公司"
@@ -74,115 +60,6 @@
             </el-button> -->
           </el-col>
         </el-form-item>
-        <!-- 入库方审核备注 -->
-
-        <!-- 物流费用 -->
-        <!-- <el-form-item label="入库仓库" prop="stock_in_rule">
-          <el-cascader
-            placeholder="请选择入库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="selectStock_in"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName();
-            "
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item label="出库商品" prop="stock_go_product">
-          <ex-table
-            v-loading="false"
-            :table="table"
-            :data="tableData"
-            :columns="columns"
-            :page="pageInfo"
-            :size="size"
-            @page-curr-change="handlePageChange"
-            @page-size-change="handleSizeChange"
-            @screen-reset="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-            @screen-submit="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-          >
-            <template #table-header="{}">
-              <div style="width: 100%; height: 40px"></div>
-            </template>
-            <template #operation="{ scope }">
-              <el-tooltip
-                v-if="powers.some((item) => item == '002')"
-                effect="dark"
-                content="重置密码"
-                placement="top"
-              >
-                <i
-                  class="el-icon-refresh-left tb-icon"
-                  @click="openPasswordModal(scope.row.id, false)"
-                ></i>
-              </el-tooltip>
-
-              <el-tooltip
-                v-if="powers.some((item) => item == '007')"
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <i
-                  class="el-icon-view tb-icon"
-                  @click="openModal(scope.row.id, true, scope.row)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="powers.some((item) => item == '005')"
-                effect="dark"
-                content="修改"
-                placement="top"
-              >
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="openModal(scope.row.id, false, scope.row)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '1'
-                "
-                effect="dark"
-                content="禁用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-pause tb-icon"
-                  @click="statusConfirm(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '0'
-                "
-                effect="dark"
-                content="启用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-play tb-icon"
-                  @click="statusConfirm(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-            </template>
-          </ex-table>
-        </el-form-item> -->
       </el-form>
 
       <add-edit

src/views/stock/allotFlow/components/inStock-audit.vue

@@ -13,20 +13,6 @@
         label-width="165px"
       >
         <el-form-item label="入库方审核状态" prop="stock_go_rule">
-          <!-- <el-cascader
-            placeholder="请选择出库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="selectStock_go"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName();
-            "
-          ></el-cascader> -->
           <el-select
             v-model="value"
             placeholder="入库方审核"
@@ -51,7 +37,6 @@
             :size="searchSize"
             v-model="remark"
             clearable
-            
           >
           </el-input>
         </el-form-item>
@@ -65,115 +50,6 @@
             </el-button> -->
           </el-col>
         </el-form-item>
-        <!-- <el-form-item label="审核备注" prop="stock_remark">
-         
-        </el-form-item> -->
-        <!-- <el-form-item label="入库仓库" prop="stock_in_rule">
-          <el-cascader
-            placeholder="请选择入库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="selectStock_in"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName();
-            "
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item label="出库商品" prop="stock_go_product">
-          <ex-table
-            v-loading="false"
-            :table="table"
-            :data="tableData"
-            :columns="columns"
-            :page="pageInfo"
-            :size="size"
-            @page-curr-change="handlePageChange"
-            @page-size-change="handleSizeChange"
-            @screen-reset="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-            @screen-submit="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-          >
-            <template #table-header="{}">
-              <div style="width: 100%; height: 40px"></div>
-            </template>
-            <template #operation="{ scope }">
-              <el-tooltip
-                v-if="powers.some((item) => item == '002')"
-                effect="dark"
-                content="重置密码"
-                placement="top"
-              >
-                <i
-                  class="el-icon-refresh-left tb-icon"
-                  @click="openPasswordModal(scope.row.id, false)"
-                ></i>
-              </el-tooltip>
-
-              <el-tooltip
-                v-if="powers.some((item) => item == '007')"
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <i
-                  class="el-icon-view tb-icon"
-                  @click="openModal(scope.row.id, true, scope.row)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="powers.some((item) => item == '005')"
-                effect="dark"
-                content="修改"
-                placement="top"
-              >
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="openModal(scope.row.id, false, scope.row)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '1'
-                "
-                effect="dark"
-                content="禁用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-pause tb-icon"
-                  @click="statusConfirm(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '0'
-                "
-                effect="dark"
-                content="启用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-play tb-icon"
-                  @click="statusConfirm(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-            </template>
-          </ex-table>
-        </el-form-item> -->
       </el-form>
 
       <add-edit
@@ -333,13 +209,7 @@ export default {
   methods: {
     restSearch() {
       //重置入参
-      this.parmValue = {
-        // name: "", // 业务员名字
-        // username: "", // 账号
-        // status: "", //
-        // page: 1, // 页码
-        // size: 10, // 每页显示条数
-      };
+      this.parmValue = {};
       this.searchList();
     },
 
@@ -423,60 +293,6 @@ export default {
       //     console.log("取消");
       //   });
     },
-    // async stockName() {
-    //   //获取多级仓库名称的方法
-    //   const res = await asyncRequest.listAll(this.parmValue);
-    //   // console.log(res.data);
-    //   // this.openModal("005", true);
-    //   // console.log(this.selectStock_go);
-    //   // console.log(this.selectStock_in);
-    //   // this.options = res.data;
-    //   // console.log(this.options);
-    //   let arr = res.data;
-    //   // console.log(arr);
-    //   arr.forEach((ele) => {
-    //     //重新封装后台传递来的数据,转换格式
-    //     let item = {
-    //       value: ele.id,
-    //       label: ele.name,
-    //       children: [],
-    //     };
-    //     ele.child.forEach((elem) => {
-    //       let model = {
-    //         value: elem.id,
-    //         label: elem.name,
-    //       };
-    //       item.children.push(model);
-    //     });
-    //     this.options.push(item);
-    //   });
-    //   this.options.forEach((ele) => {
-    //     //从数据表中筛选出我们要用的数据
-    //     if (ele.value === this.selectStock_go[0]) {
-    //       ele.children.forEach((elem) => {
-    //         if (elem.value === this.selectStock_go[1]) {
-    //           this.stock_go = ele.label + "/" + elem.label;
-    //         }
-    //       });
-    //     }
-    //     if (ele.value === this.selectStock_in[0]) {
-    //       ele.children.forEach((elem) => {
-    //         if (elem.value === this.selectStock_in[1]) {
-    //           this.stock_in = ele.label + "/" + elem.label;
-    //         }
-    //       });
-    //     }
-    //   });
-    //   if (this.selectStock_in != "" || this.selectStock_go != "") {
-    //     console.log("选择了一个项目");
-    //     this.openModal("005", true);
-    //   }
-    //   // console.log(this.stock_go);
-    //   // console.log(this.stock_in);
-    //   // console.log(this.pageInfo.total);
-    //   this.compareStock(); //比较出库仓库和入库仓库是否相同
-    // },
-
     compareStock() {
       //比较出库仓库和入库仓库是否相同
       if (
@@ -500,8 +316,5 @@ export default {
 .el-form-item__content {
   margin: 0 !important;
 }
-.setcol-table-lie {
-  // margin: 0 !important;
-}
 </style>
    

src/views/stock/allotFlow/components/inStock-check.vue

@@ -102,148 +102,13 @@
             </template>
           </ex-table>
         </el-form-item>
-        <!-- <el-form-item label="发货物流编号" prop="expressage_sn">
-          <el-input
-            type="number"
-            :rows="2"
-            style="width: 30%"
-            placeholder="请输入物流单号"
-            :size="searchSize"
-            v-model="expressage"
-            clearable
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="发货物流费用" prop="expressage_cost">
-          <el-input
-            type="number"
-            style="width: 20%"
-            placeholder="请输入物流费用"
-            :size="searchSize"
-            v-model="expressage"
-            clearable
-          >
-          </el-input>
-        </el-form-item> -->
         <el-form-item>
           <el-col :span="24" style="text-align: right; margin-top: 10px">
             <el-button type="primary" @click="save" v-show="myType === 4"
               >保 存
             </el-button>
-            <!-- <el-button type="warning" @click="submitForm"
-              >保 存 并 发 起 流 程
-            </el-button> -->
           </el-col>
         </el-form-item>
-        <!-- 入库方审核备注 -->
-
-        <!-- 物流费用 -->
-        <!-- <el-form-item label="入库仓库" prop="stock_in_rule">
-          <el-cascader
-            placeholder="请选择入库仓库"
-            filterable
-            clearable
-            :size="searchSize"
-            v-model="selectStock_in"
-            :options="options"
-            style="width: 30%"
-            @change="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              stockName();
-            "
-          ></el-cascader>
-        </el-form-item>
-        <el-form-item label="出库商品" prop="stock_go_product">
-          <ex-table
-            v-loading="false"
-            :table="table"
-            :data="tableData"
-            :columns="columns"
-            :page="pageInfo"
-            :size="size"
-            @page-curr-change="handlePageChange"
-            @page-size-change="handleSizeChange"
-            @screen-reset="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-            @screen-submit="
-              pageInfo.curr = 1;
-              parmValue.page = 1;
-              searchList();
-            "
-          >
-            <template #table-header="{}">
-              <div style="width: 100%; height: 40px"></div>
-            </template>
-            <template #operation="{ scope }">
-              <el-tooltip
-                v-if="powers.some((item) => item == '002')"
-                effect="dark"
-                content="重置密码"
-                placement="top"
-              >
-                <i
-                  class="el-icon-refresh-left tb-icon"
-                  @click="openPasswordModal(scope.row.id, false)"
-                ></i>
-              </el-tooltip>
-
-              <el-tooltip
-                v-if="powers.some((item) => item == '007')"
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <i
-                  class="el-icon-view tb-icon"
-                  @click="openModal(scope.row.id, true, scope.row)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="powers.some((item) => item == '005')"
-                effect="dark"
-                content="修改"
-                placement="top"
-              >
-                <i
-                  class="el-icon-edit tb-icon"
-                  @click="openModal(scope.row.id, false, scope.row)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '1'
-                "
-                effect="dark"
-                content="禁用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-pause tb-icon"
-                  @click="statusConfirm(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-              <el-tooltip
-                v-if="
-                  powers.some((item) => item == '004') &&
-                  scope.row.status === '0'
-                "
-                effect="dark"
-                content="启用"
-                placement="top"
-              >
-                <i
-                  class="el-icon-video-play tb-icon"
-                  @click="statusConfirm(scope.row.id, scope.row.status)"
-                ></i>
-              </el-tooltip>
-            </template>
-          </ex-table>
-        </el-form-item> -->
       </el-form>
 
       <add-edit

src/views/stock/allotFlow/components/newApply.vue

@@ -21,7 +21,7 @@
             @change="
               pageInfo.curr = 1;
               parmValue.page = 1;
-              stockName();
+              stockName(true);
             "
           ></el-cascader>
         </el-form-item>
@@ -187,7 +187,7 @@ export default {
   data() {
     return {
       selectStock_in: "", //选择的入库仓库名称
-      selectStock_go: "", //选择的出库仓库名称
+      selectStock_go: [], //选择的出库仓库名称
       stock_go: "", //出库仓库name
       stock_in: "", //入库仓库name
       options: [], //用于渲染二级仓库名
@@ -279,18 +279,12 @@ export default {
   methods: {
     restSearch() {
       //重置入参
-      this.parmValue = {
-        // name: "", // 业务员名字
-        // username: "", // 账号
-        // status: "", //
-        // page: 1, // 页码
-        // size: 10, // 每页显示条数
-      };
+      this.parmValue = {};
       this.searchList();
     },
 
     openModal(id, isDetail, sitem) {
-      this.showModel = true;
+      this.showModel = isDetail;
       this.modelId = id;
       this.isDetail = isDetail;
       this.sitem = sitem;
@@ -369,7 +363,7 @@ export default {
       //     console.log("取消");
       //   });
     },
-    async stockName() {
+    async stockName(isShowModal = false) {
       //获取多级仓库名称的方法
       const res = await asyncRequest.listAll(this.parmValue);
       // console.log(res.data);
@@ -415,11 +409,15 @@ export default {
       });
       if (this.selectStock_in != "" || this.selectStock_go != "") {
         console.log("选择了一个项目");
-        this.openModal("005", true);
+        this.openModal("005", isShowModal);
       }
-      // console.log(this.stock_go);
-      // console.log(this.stock_in);
+      console.log(this.stock_go);
+      console.log(this.stock_in);
+      //   if(){
+
+      //   }
       // console.log(this.pageInfo.total);
+
       this.compareStock(); //比较出库仓库和入库仓库是否相同
     },
 

src/views/stock/stockWarning/index.vue

@@ -146,8 +146,8 @@
             "
           ></el-tag>
         </template> -->
-        <template #operation="{ scope }">
-          <!-- <div>123{{ scope.row }}</div> -->
+        <!-- <template #operation="{ scope }">
+          <div>123{{ scope.row }}</div>
           <el-tooltip
             v-if="powers.some((item) => item == '005')"
             effect="dark"
@@ -185,16 +185,16 @@
               @click="statusConfirm(scope.row.id, scope.row.status)"
             ></i>
           </el-tooltip>
-        </template>
+        </template> -->
       </ex-table>
-      <!-- <add-edit
+      <add-edit
         :id="modelId"
         :sitem="sitem"
         :show-model="showModel"
         :is-detail="isDetail"
         @refresh="searchList"
         @cancel="showModel = false"
-      /> -->
+      />
     </div>
     <div v-else>
       <no-auth></no-auth>