liujt 1 месяц назад
Родитель
Сommit
1ba26356aa

+ 4 - 2
src/views/warehouseManagement/index/index.vue

@@ -1,8 +1,10 @@
 <template>
   <div>
-    <yuxin v-if="$hasPermission('wms:home:yuxin')"></yuxin>
+    <yuxin></yuxin>
+
+    <!-- v-if="$hasPermission('wms:home:yuxin')" -->
      
-    <common v-else></common>
+    <!-- <common v-else></common> -->
   </div>
 </template>
 

+ 309 - 293
src/views/warehouseManagement/stocktaking/plan/components/addInventoryDialog.vue

@@ -1,316 +1,327 @@
 <template>
-  <el-dialog
+  <ele-modal
     :visible.sync="dialogVisible"
     :title="dialogTile"
     :before-close="handleClose"
     :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    v-loading="addDialogLoading"
+    :maxable="true"
+    :append-to-body="true"
     width="80%"
   >
-    <HeaderTitle title="基本信息" size="16px"></HeaderTitle>
+    <div v-loading="addDialogLoading">
+      
+    
     <el-form
       :model="addForm"
       class="add_form"
       ref="addFormRef"
       :rules="rules"
       label-width="110px"
-    >
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="计划配置单号" prop="code">
-            <el-input
-              v-model="addForm.code"
-              placeholder="自动生成"
-              disabled
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="计划配置名字" prop="name">
-            <el-input
-              :disabled="isBindPlan"
-              v-model="addForm.name"
-              placeholder="请输入"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="自动派单" prop="autoOrder">
-            <el-select
-              v-model="addForm.autoOrder"
-              class="w100"
-              placeholder="请选择"
-              :disabled="isBindPlan"
-              filterable
-            >
-              <el-option :value="1" label="是"></el-option>
-              <el-option :value="0" label="否"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="规则名称" prop="ruleId">
+    > 
+      <el-tabs type="border-card">
+        <el-tab-pane label="计划基本信息">
+          <HeaderTitle title="基本信息" size="16px"></HeaderTitle>
+          <el-row :gutter="20">
+            <el-col :span="8">
+              <el-form-item label="计划配置单号" prop="code">
+                <el-input
+                  v-model="addForm.code"
+                  placeholder="自动生成"
+                  disabled
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="计划配置名字" prop="name">
+                <el-input
+                  :disabled="isBindPlan"
+                  v-model="addForm.name"
+                  placeholder="请输入"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="自动派单" prop="autoOrder">
+                <el-select
+                  v-model="addForm.autoOrder"
+                  class="w100"
+                  placeholder="请选择"
+                  :disabled="isBindPlan"
+                  filterable
+                >
+                  <el-option :value="1" label="是"></el-option>
+                  <el-option :value="0" label="否"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="盘点规则名称" prop="ruleId">
+                <el-select
+                  v-model="addForm.ruleId"
+                  class="w100"
+                  placeholder="请选择规则名称"
+                  @change="change_ruleId"
+                  :disabled="isBindPlan"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in ruleNameList"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                    @click.native="addForm.ruleName = item.name"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="计划盘点时长" prop="executorDuration">
+                <el-input
+                  v-model.number="addForm.executorDuration"
+                  placeholder="请输入"
+                  :disabled="isBindPlan"
+                >
+                  <template #suffix>分钟</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="盘点仓库" prop="warehouseId">
+                <el-select
+                  placeholder="请选择"
+                  class="w100"
+                  :disabled="isBindPlan"
+                  v-model="addForm.warehouseId"
+                  @change="changeWarehouse"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in warehouseList"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                    @click.native="
+                      () => {
+                        addForm.bizTypeName = item.name;
+                      }
+                    "
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="审核人" prop="approvalUserId">
+                <el-select
+                  v-model="addForm.approvalUserId"
+                  size="small"
+                  style="width: 100%"
+                  :disabled="isBindPlan"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in uerList"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="紧急程度" prop="urgent">
+                <DictSelection
+                  :isProhibit="isBindPlan"
+                  dictName="紧急程度"
+                  clearable
+                  filterable
+                  v-model="addForm.urgent"
+                >
+                </DictSelection>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" v-if="addForm.autoOrder">
+              <el-form-item label="执行部门" prop="executeGroupId">
+                <deptSelect
+                  :isBindPlan="isBindPlan"
+                  v-model="addForm.executeGroupId"
+                  @changeGroup="searchDeptNodeClick"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" v-if="addForm.autoOrder">
+              <el-form-item label="执行人员" prop="executorId">
+                <el-select
+                  v-model="addForm.executorId"
+                  @change="changeExecutor"
+                  :disabled="isBindPlan"
+                  size="small"
+                  style="width: 100%"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in executorList"
+                    :key="item.id"
+                    :value="item.id"
+                    :label="item.name"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="8">
+              <el-form-item label="锁库盘点" prop="isTreasuryLock">
+                <el-switch
+                  v-model="addForm.lockWarehouse"
+                  active-text="开"
+                  inactive-text="关"
+                  :active-value="1"
+                  :inactive-value="0"
+                  :disabled="isBindPlan"
+                ></el-switch>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remark">
+                <el-input
+                  placeholder="请输入"
+                  type="textarea"
+                  :rows="2"
+                  resize="none"
+                  v-model="addForm.remark"
+                  :disabled="isBindPlan"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-tab-pane>
+        <el-tab-pane label="盘点物品">
+          <HeaderTitle title="盘点物品信息" size="16px">
             <el-select
-              v-model="addForm.ruleId"
-              class="w100"
-              placeholder="请选择规则名称"
-              @change="change_ruleId"
               :disabled="isBindPlan"
-              filterable
+              @change="dimensionChange"
+              v-model="dimension"
+              placeholder="请选择维度"
             >
-              <el-option
-                v-for="item in ruleNameList"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-                @click.native="addForm.ruleName = item.name"
-              ></el-option>
+              <el-option label="物品维度" :value="1"> </el-option>
+              <el-option label="批次维度" :value="2"> </el-option>
             </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="计划盘点时长" prop="executorDuration">
-            <el-input
-              v-model.number="addForm.executorDuration"
-              placeholder="请输入"
-              :disabled="isBindPlan"
+            <el-button
+              v-if="!isBindPlan"
+              style="margin-left: 10px"
+              type="primary"
+              @click="addProducts"
+              >添加物品</el-button
             >
-              <template #suffix>分钟</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="盘点仓库" prop="warehouseId">
-            <el-select
-              placeholder="请选择"
-              class="w100"
-              :disabled="isBindPlan"
-              v-model="addForm.warehouseId"
-              @change="changeWarehouse"
-              filterable
+          </HeaderTitle>
+          <el-table
+            ref="table"
+            :data="productList"
+            :height="500"
+            row-key="id"
+            tooltip-effect="dark"
+            border
+          >
+            <el-table-column label="序号" type="index" width="50">
+            </el-table-column>
+            <el-table-column
+              label="物品编码"
+              prop="categoryCode"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="物品名称"
+              prop="categoryName"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              width="150"
+              prop="categoryLevelPath"
+              label="产品分类"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="批次号"
+              prop="batchNo"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="牌号"
+              prop="brandNum"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="型号"
+              prop="categoryModel"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="规格"
+              prop="specification"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="计量数量"
+              prop="measureQuantity"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="计量单位"
+              prop="measureUnit"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              label="重量"
+              prop="weight"
+              :show-overflow-tooltip="true"
             >
-              <el-option
-                v-for="item in warehouseList"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-                @click.native="
-                  () => {
-                    addForm.bizTypeName = item.name;
-                  }
-                "
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="审核人" prop="approvalUserId">
-            <el-select
-              v-model="addForm.approvalUserId"
-              size="small"
-              style="width: 100%"
-              :disabled="isBindPlan"
-              filterable
+            </el-table-column>
+            <el-table-column
+              label="重量单位"
+              prop="weightUnit"
+              :show-overflow-tooltip="true"
             >
-              <el-option
-                v-for="item in uerList"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="紧急程度" prop="urgent">
-            <DictSelection
-              :isProhibit="isBindPlan"
-              dictName="紧急程度"
-              clearable
-              filterable
-              v-model="addForm.urgent"
-            >
-            </DictSelection>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="addForm.autoOrder">
-          <el-form-item label="执行部门" prop="executeGroupId">
-            <deptSelect
-              :isBindPlan="isBindPlan"
-              v-model="addForm.executeGroupId"
-              @changeGroup="searchDeptNodeClick"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="addForm.autoOrder">
-          <el-form-item label="执行人员" prop="executorId">
-            <el-select
-              v-model="addForm.executorId"
-              @change="changeExecutor"
-              :disabled="isBindPlan"
-              size="small"
-              style="width: 100%"
-              filterable
-            >
-              <el-option
-                v-for="item in executorList"
-                :key="item.id"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item label="锁库盘点" prop="isTreasuryLock">
-            <el-switch
-              v-model="addForm.lockWarehouse"
-              active-text="开"
-              inactive-text="关"
-              :active-value="1"
-              :inactive-value="0"
-              :disabled="isBindPlan"
-            ></el-switch>
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="24">
-          <el-form-item label="备注" prop="remark">
-            <el-input
-              placeholder="请输入"
-              type="textarea"
-              :rows="2"
-              resize="none"
-              v-model="addForm.remark"
-              :disabled="isBindPlan"
-            ></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <HeaderTitle title="盘点物品信息" size="16px">
-        <el-select
-          :disabled="isBindPlan"
-          @change="dimensionChange"
-          v-model="dimension"
-          placeholder="请选择维度"
-        >
-          <el-option label="物品维度" :value="1"> </el-option>
-          <el-option label="批次维度" :value="2"> </el-option>
-        </el-select>
-        <el-button
-          v-if="!isBindPlan"
-          style="margin-left: 10px"
-          type="primary"
-          @click="addProducts"
-          >添加物品</el-button
-        >
-      </HeaderTitle>
-      <el-table
-        ref="table"
-        :data="productList"
-        :height="500"
-        row-key="id"
-        tooltip-effect="dark"
-        border
-      >
-        <el-table-column label="序号" type="index" width="50">
-        </el-table-column>
-        <el-table-column
-          label="物品编码"
-          prop="categoryCode"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="物品名称"
-          prop="categoryName"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          width="150"
-          prop="categoryLevelPath"
-          label="产品分类"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="批次号"
-          prop="batchNo"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="牌号"
-          prop="brandNum"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="型号"
-          prop="categoryModel"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="规格"
-          prop="specification"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="计量数量"
-          prop="measureQuantity"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="计量单位"
-          prop="measureUnit"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          label="重量"
-          prop="weight"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-        <el-table-column
-          label="重量单位"
-          prop="weightUnit"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="warehouseName"
-          label="仓库"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          prop="inventoryCycle"
-          label="存货周期"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          prop="colorKey"
-          label="颜色"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column
-          prop="modelKey"
-          label="机型"
-          :show-overflow-tooltip="true"
-        ></el-table-column>
-        <el-table-column v-if="!isBindPlan" label="操作" width="100">
-          <template slot-scope="{ row, $index }">
-            <el-button @click="deleted(row, $index)" type="text" size="small"
-              >删除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
+            </el-table-column>
+            <el-table-column
+              prop="warehouseName"
+              label="仓库"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="inventoryCycle"
+              label="存货周期"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="colorKey"
+              label="颜色"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column
+              prop="modelKey"
+              label="机型"
+              :show-overflow-tooltip="true"
+            ></el-table-column>
+            <el-table-column v-if="!isBindPlan" label="操作" width="100">
+              <template slot-scope="{ row, $index }">
+                <el-button @click="deleted(row, $index)" type="text" size="small"
+                  >删除</el-button
+                >
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-tab-pane>
+      </el-tabs>
+      
+      
     </el-form>
-    <div v-if="!isBindPlan" slot="footer">
-      <el-button type="primary" size="small" @click="submit">提交</el-button>
-      <el-button size="small" @click="handleClose">关闭</el-button>
-    </div>
-    <div v-else slot="footer">
-      <el-button type="primary" size="small" @click="dialogVisible = false"
-        >确定</el-button
-      >
-      <el-button size="small" @click="dialogVisible = false">关闭</el-button>
+    <div class="modal-footer">
+      <template v-if="!isBindPlan">
+        <el-button type="primary" size="small" @click="submit">提交</el-button>
+        <el-button size="small" @click="handleClose">关闭</el-button>
+      </template>
+      <template v-else>
+        <el-button type="primary" size="small" @click="dialogVisible = false">确定</el-button>
+        <el-button size="small" @click="dialogVisible = false">关闭</el-button>
+      </template>
     </div>
     <selectType
       :visibleDialog.sync="visibleDialog"
@@ -321,7 +332,8 @@
       :loadTree.sync="loadTree"
       @selectTableData="addGoods"
     />
-  </el-dialog>
+    </div>
+  </ele-modal>
 </template>
 
 <script>
@@ -690,6 +702,10 @@
     display: flex;
     flex-wrap: wrap;
   }
+  .modal-footer {
+    text-align: right;
+    margin-top: 16px;
+  }
   .add_form {
     ::v-deep .el-form-item {
       margin-bottom: 20px !important;