55

src/views/bpm/handleTask/components/bomApproverJSYY/detailDialog.vue

@@ -13,50 +13,61 @@
       tool-class="ele-toolbar-actions"
     >
       <template v-slot:toolbar>
-        <div v-if="taskDefinitionKey == 'Activity_0uypakw'">
-          <el-input
-            size="mini"
-            v-model="materielDesignationPL"
-            placeholder="请输入物料代号"
-            style="width: 220px"
-          ></el-input>
-          <el-button
-            size="mini"
-            type="primary"
-            style="margin-left: 20px"
-            @click="handMaterPL"
-            >批量</el-button
-          >
-        </div>
+        <div class="toolbar_box">
+          <div>
+            <div v-if="taskDefinitionKey == 'Activity_0uypakw'">
+              <el-input
+                size="mini"
+                v-model="materielDesignationPL"
+                placeholder="请输入物料代号"
+                style="width: 220px"
+              ></el-input>
+              <el-button
+                size="mini"
+                type="primary"
+                style="margin-left: 20px"
+                @click="handMaterPL"
+                >批量</el-button
+              >
+            </div>
 
-        <div
-          v-if="
-            taskDefinitionKey == 'Activity_021lrxj' ||
-            taskDefinitionKey == 'Activity_1q7btlc'
-          "
-        >
-          <el-select
-            v-model="supplierIdPL"
-            size="mini"
-            clearable
-            style="width: 100%"
-            filterable
-            placeholder="请选择供应商"
-          >
-            <el-option
-              v-for="item in gysList"
-              :key="item.id"
-              :value="item.id"
-              :label="item.name"
-            ></el-option>
-          </el-select>
-          <el-button
-            size="mini"
-            type="primary"
-            style="margin-left: 20px"
-            @click="handMaterPL2"
-            >批量</el-button
-          >
+            <div
+              v-if="
+                taskDefinitionKey == 'Activity_021lrxj' ||
+                taskDefinitionKey == 'Activity_1q7btlc'
+              "
+            >
+              <el-select
+                v-model="supplierIdPL"
+                size="mini"
+                clearable
+                style="width: 200px"
+                filterable
+                placeholder="请选择供应商"
+              >
+                <el-option
+                  v-for="item in gysList"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                ></el-option>
+              </el-select>
+              <el-button
+                size="mini"
+                type="primary"
+                style="margin-left: 20px"
+                @click="handMaterPL2"
+                >批量</el-button
+              >
+            </div>
+          </div>
+
+          <div
+            ><span>基本数量</span>
+            <el-input placeholder="请输入" v-model.number="baseCount">
+            </el-input>
+            <DictSelection dictName="计量单位" v-model="unit"
+          /></div>
         </div>
       </template>
 
@@ -125,6 +136,9 @@
         materielDesignationPL: null,
         supplierIdPL: null,
 
+        baseCount: null,
+        unit: null,
+
         columns: [
           {
             label: '序号',
@@ -134,7 +148,7 @@
             align: 'center',
             showOverflowTooltip: true
           },
-  
+
           {
             prop: 'categoryCode',
             label: '编码',
@@ -249,9 +263,7 @@
 
       getTableValue() {
         return this.$refs.table.getData() || [];
-      },
-
-
+      }
     }
   };
 </script>
@@ -261,4 +273,21 @@
     padding-bottom: 30px !important;
     border-bottom: 12px solid #ccffcc !important;
   }
+
+  .toolbar_box {
+    display: flex;
+    justify-content: space-between;
+    margin-right: 10px;
+    > div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      > span {
+        width: 150px;
+      }
+      > div {
+        margin-left: 10px;
+      }
+    }
+  }
 </style>

src/views/bpm/handleTask/components/bomApproverJSdevice/detailDialog.vue

@@ -13,50 +13,61 @@
       tool-class="ele-toolbar-actions"
     >
       <template v-slot:toolbar>
-        <div v-if="taskDefinitionKey == 'Activity_0uypakw'">
-          <el-input
-            size="mini"
-            v-model="materielDesignationPL"
-            placeholder="请输入物料代号"
-            style="width: 220px"
-          ></el-input>
-          <el-button
-            size="mini"
-            type="primary"
-            style="margin-left: 20px"
-            @click="handMaterPL"
-            >批量</el-button
-          >
-        </div>
+        <div class="toolbar_box">
+          <div>
+            <div v-if="taskDefinitionKey == 'Activity_0uypakw'">
+              <el-input
+                size="mini"
+                v-model="materielDesignationPL"
+                placeholder="请输入物料代号"
+                style="width: 220px"
+              ></el-input>
+              <el-button
+                size="mini"
+                type="primary"
+                style="margin-left: 20px"
+                @click="handMaterPL"
+                >批量</el-button
+              >
+            </div>
 
-        <div
-          v-if="
-            taskDefinitionKey == 'Activity_021lrxj' ||
-            taskDefinitionKey == 'Activity_1q7btlc'
-          "
-        >
-          <el-select
-            v-model="supplierIdPL"
-            size="mini"
-            clearable
-            style="width: 100%"
-            filterable
-            placeholder="请选择供应商"
-          >
-            <el-option
-              v-for="item in gysList"
-              :key="item.id"
-              :value="item.id"
-              :label="item.name"
-            ></el-option>
-          </el-select>
-          <el-button
-            size="mini"
-            type="primary"
-            style="margin-left: 20px"
-            @click="handMaterPL2"
-            >批量</el-button
-          >
+            <div
+              v-if="
+                taskDefinitionKey == 'Activity_021lrxj' ||
+                taskDefinitionKey == 'Activity_1q7btlc'
+              "
+            >
+              <el-select
+                v-model="supplierIdPL"
+                size="mini"
+                clearable
+                style="width: 200px"
+                filterable
+                placeholder="请选择供应商"
+              >
+                <el-option
+                  v-for="item in gysList"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                ></el-option>
+              </el-select>
+              <el-button
+                size="mini"
+                type="primary"
+                style="margin-left: 20px"
+                @click="handMaterPL2"
+                >批量</el-button
+              >
+            </div>
+          </div>
+
+          <div
+            ><span>基本数量</span>
+            <el-input placeholder="请输入" v-model.number="baseCount">
+            </el-input>
+            <DictSelection dictName="计量单位" v-model="unit"
+          /></div>
         </div>
       </template>
 
@@ -134,7 +145,7 @@
             align: 'center',
             showOverflowTooltip: true
           },
-  
+
           {
             prop: 'categoryCode',
             label: '编码',
@@ -249,9 +260,7 @@
 
       getTableValue() {
         return this.$refs.table.getData() || [];
-      },
-
-
+      }
     }
   };
 </script>
@@ -261,4 +270,21 @@
     padding-bottom: 30px !important;
     border-bottom: 12px solid #ccffcc !important;
   }
+
+  .toolbar_box {
+    display: flex;
+    justify-content: space-between;
+    margin-right: 10px;
+    > div {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      > span {
+        width: 150px;
+      }
+      > div {
+        margin-left: 10px;
+      }
+    }
+  }
 </style>