Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -509,6 +509,14 @@
             <!-- 表头工具栏 -->
             <template v-if="!isView" v-slot:toolbar>
               <el-button type="primary" @click="add">添加</el-button>
+              <div class="toolbar_box">
+                <div
+                  ><span>基本数量</span>
+                  <el-input placeholder="请输入" v-model.number="baseCount">
+                  </el-input>
+                  <DictSelection dictName="计量单位" v-model="baseCountUnit"
+                /></div>
+              </div>
             </template>
             <template v-slot:action="{ row, $index }">
               <el-link type="primary" @click="handleDel(row, $index)"
@@ -996,6 +1004,8 @@
     mixins: [dictMixins],
     data() {
       return {
+        baseCount: '',
+        baseCountUnit: '',
         isView: false,
         filedList: [],
         jobFiledList: [],
@@ -1616,6 +1626,11 @@
           // 保存标准工时
           this.tableData.taskParam[this.currentIndex].normalHours =
             this.normalHours;
+          // 保存材料定额
+          this.tableData.taskParam[this.currentIndex].baseCount =
+            thsis.baseCount;
+          this.tableData.taskParam[this.currentIndex].baseCountUnit =
+            thsis.baseCountUnit;
           workingProcedureUpdate({
             id: this.tableData.id,
             categoryId: this.treeData.categoryId,
@@ -1641,4 +1656,19 @@
   .downLoad {
     display: flex;
   }
+  .toolbar_box {
+    float: right;
+    margin-right: 10px;
+    > div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      > span {
+        width: 150px;
+      }
+      > div {
+        margin-left: 10px;
+      }
+    }
+  }
 </style>

src/views/material/BOMmanage/details.vue

@@ -103,22 +103,14 @@
                 <document></document>
               </el-tab-pane>
               <el-tab-pane
-                v-if="
-                  currentNodeData.bomType == 2 &&
-                  treeList.length > 0 &&
-                  currentNodeData.children?.length < 1
-                "
+                v-if="currentNodeData.bomType == 2"
                 label="工艺路线"
                 name="工艺路线"
               >
                 <routing :taskParam="currentNodeData"></routing>
               </el-tab-pane>
               <el-tab-pane
-                v-if="
-                  currentNodeData.bomType == 2 &&
-                  treeList.length > 0 &&
-                  currentNodeData.children?.length < 1
-                "
+                v-if="currentNodeData.bomType == 2"
                 label="工艺"
                 name="工艺"
               >

src/views/material/product/components/WarehouseInfo.vue

@@ -1,68 +1,88 @@
 <template>
   <div class="other">
-      <el-form label-width="120px"  ref="form" :model="form">
-         <div class="divider">
-           <div class="title">
-             <div class="ele-bg-primary"></div>
-             <span>仓储配置</span>
-           </div>
-           <div class="ele-bg-primary ele-width"></div>
-         </div>
-         <el-row :gutter="24">
-           <el-col :span="8">
-             <el-form-item label="启用库存预警">
-                <el-radio v-model="form.isWarn" :label="1">是</el-radio>
-                <el-radio v-model="form.isWarn" :label="0">否</el-radio>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="允许拆包" prop="isUnpack">
-                <el-switch v-model="form.isUnpack" :active-value="1" :inactive-value="0"> </el-switch>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="安全库存" prop="secureInventory">
-                <el-input  v-model="form.secureInventory"/>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="最小库存" prop="minInventory">
-                <el-input  v-model="form.minInventory"/>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="最大库存" prop="maxInventory">
-                <el-input  v-model="form.maxInventory"/>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="盘点模式" prop="inventoryMode">
-               <el-radio v-model="form.inventoryMode" :label="1">逐个盘点</el-radio>
-               <el-radio v-model="form.inventoryMode" :label="2">批量盘点</el-radio>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="质保预警参考" prop="warrantyWarnRefer">
-                <DictSelection dictName="质保预警参考" clearable v-model="form.warrantyWarnRefer">
-                </DictSelection>
-             </el-form-item>
-           </el-col>
-           <el-col :span="8">
-             <el-form-item label="保质期">
-                <div class="form-line">
-                  <el-input  v-model="form.warrantyPeriod"/>
-                  <DictSelection class="line-select" dictName="保质期单位" clearable v-model="form.warrantyPeriodUnit">
-                  </DictSelection>
-                </div>
-             </el-form-item>
-           </el-col>
-         </el-row>
-      </el-form>
+    <el-form label-width="120px" ref="form" :model="form">
+      <div class="divider">
+        <div class="title">
+          <div class="ele-bg-primary"></div>
+          <span>仓储配置</span>
+        </div>
+        <div class="ele-bg-primary ele-width"></div>
+      </div>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="启用库存预警">
+            <el-radio v-model="form.isWarn" :label="1">是</el-radio>
+            <el-radio v-model="form.isWarn" :label="0">否</el-radio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="盘点模式" prop="inventoryMode">
+            <el-radio-group
+              v-model="form.inventoryMode"
+              @input="inventoryModeChange"
+            >
+              <el-radio :label="1">逐个盘点</el-radio>
+              <el-radio :label="2">批量盘点</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="允许拆包" prop="isUnpack">
+            <el-switch
+              v-model="form.isUnpack"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="安全库存" prop="secureInventory">
+            <el-input v-model="form.secureInventory" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="最小库存" prop="minInventory">
+            <el-input v-model="form.minInventory" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="最大库存" prop="maxInventory">
+            <el-input v-model="form.maxInventory" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="质保预警参考" prop="warrantyWarnRefer">
+            <DictSelection
+              dictName="质保预警参考"
+              clearable
+              v-model="form.warrantyWarnRefer"
+            >
+            </DictSelection>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="保质期">
+            <div class="form-line">
+              <el-input v-model="form.warrantyPeriod" />
+              <DictSelection
+                class="line-select"
+                dictName="保质期单位"
+                clearable
+                v-model="form.warrantyPeriodUnit"
+              >
+              </DictSelection>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
   </div>
 </template>
 
 <script>
-  import deptSelect from '@/components/CommomSelect/dept-select.vue'
+  import deptSelect from '@/components/CommomSelect/dept-select.vue';
   import personSelect from '@/components/CommomSelect/person-select.vue';
   export default {
     props: {
@@ -71,17 +91,21 @@
         default: {}
       }
     },
-    components: { deptSelect , personSelect },
+    components: { deptSelect, personSelect },
     data() {
-      return {
-
-
-      };
+      return {};
     },
 
     methods: {
+      inventoryModeChange(value) {
+        if (value == 1) {
+          this.form.isUnpack = 1;
+        } else {
+          this.form.isUnpack = 0;
+        }
+      },
       // 选择所属部门
-      searchDeptNodeClick (id, info) {
+      searchDeptNodeClick(id, info) {
         // 根据部门获取人员
         const params = { executeGroupId: id };
         this.$nextTick(() => {
@@ -89,16 +113,13 @@
         });
       },
       //选择负责人
-      handleDirectorChange (id, info) {
-      },
-
-
+      handleDirectorChange(id, info) {}
     }
   };
 </script>
 
 <style lang="scss" scoped>
-  .other{
+  .other {
     background: #fff;
     padding: 1px 17px;
   }
@@ -117,17 +138,17 @@
         font-size: 20px;
       }
     }
-    .ele-width{
+    .ele-width {
       width: 100%;
       height: 2px;
     }
   }
-  .form-line{
+  .form-line {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    .line-select{
-      margin-left:15px;
+    .line-select {
+      margin-left: 15px;
     }
   }
 </style>