66

src/views/workOrder/index.vue

@@ -25,26 +25,26 @@
 
         <template v-slot:priority="{ row }">
           <div style="display: flex">
-          <el-input
-            v-model="row.priority"
-            type="number"
-            size="mini"
-            :min="0"
-            :max="10"
-            @change="priorityChange(row)"
-             style="width: 80px"
-          ></el-input>
-          <el-popover
-            placement="right"
-            width="200"
-            trigger="hover"
-            content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
-          >
-            <div class="sort-wrap" slot="reference">
-              <i class="el-icon-caret-top" @click="sortTop(row)"></i>
-              <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
-            </div>
-          </el-popover>
+            <el-input
+              v-model="row.priority"
+              type="number"
+              size="mini"
+              :min="0"
+              :max="10"
+              @change="priorityChange(row)"
+              style="width: 80px"
+            ></el-input>
+            <el-popover
+              placement="right"
+              width="200"
+              trigger="hover"
+              content="数值越大优先级越高（0-3普通, 4-6优先, 7-10紧急）"
+            >
+              <div class="sort-wrap" slot="reference">
+                <i class="el-icon-caret-top" @click="sortTop(row)"></i>
+                <i class="el-icon-caret-bottom" @click="sortBottom(row)"></i>
+              </div>
+            </el-popover>
           </div>
         </template>
 
@@ -73,25 +73,32 @@
       </ele-pro-table>
     </el-card>
 
-    <el-dialog :visible.sync="visible" title="选择班组" width="400px">
-      <el-select v-model="releasParams.teamId">
-        <el-option
-          v-for="item in teamList"
-          :value="item.id"
-          :key="item.id"
-          :label="item.name"
-        ></el-option>
-      </el-select>
-
-      <el-radio-group v-model="singleReport" style="margin-top: 16px;">
-        <el-radio :label="1">单件报工</el-radio>
-        <el-radio :label="0">批量报工</el-radio>
-      </el-radio-group>
+    <el-dialog :visible.sync="visible" title="派单" width="500px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="100px" >
+        <el-form-item label="指定:" prop="singleType">
+          <el-radio-group
+            v-model="form.singleType"
+            size="mini"
+          >
+            <el-radio-button :label="1">工位</el-radio-button>
+            <el-radio-button :label="2">人员</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
 
+        <el-form-item label="报工类型:" prop="singleReport">
+        <el-radio-group v-model="form.singleReport">
+          <el-radio :label="1">单件报工</el-radio>
+          <el-radio :label="0">批量报工</el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      </el-form>
+
+      
       <div class="footer" slot="footer">
-        <el-button @click="visible = false">取消</el-button>
-        <el-button type="primary" @click="confirm">确定</el-button>
-      </div>
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="confirm">确定</el-button>
+        </div>
     </el-dialog>
   </div>
 </template>
@@ -116,12 +123,13 @@
       return {
         visible: false,
         loading: false,
-        releasParams: {
-          teamId: '',
-          id: ''
+
+        form: {
+          singleType: 1,
+          singleReport: 1
         },
+        rules: {},
 
-        singleReport: 1,
         teamList: [],
 
         statusOpt: [
@@ -206,7 +214,6 @@
             sortable: 'custom'
           },
 
-
           {
             prop: 'formingNum',
             label: '要求生产数量',
@@ -244,7 +251,7 @@
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 110,
-             sortable: 'custom'
+            sortable: 'custom'
           },
           {
             slot: 'status',
@@ -293,15 +300,6 @@
           ...this.sort
         });
       },
-      async _teamPage() {
-        const res = await teamPage({
-          page: 1,
-          size: -1,
-          produceVersionId: this.current.produceVersionId
-        });
-
-        this.teamList = res.list;
-      },
 
       getFieldModel() {
         fieldModel({ fieldModel: 't_main_category' }).then((res) => {
@@ -337,20 +335,13 @@
       toRelease(row) {
         this.current = row;
         this.visible = true;
-        this._teamPage();
       },
       // 下达
       confirm() {
-        if (!this.releasParams.teamId) {
-          return this.$message.error('请选择班组');
-        }
-
         const loading = this.$loading({ text: '加载中...' });
         releaseWorkOrder({
           id: this.current.id,
-          teamId: this.releasParams.teamId,
-          singleReport: this.singleReport,
-          singleReportId: this.singleReportId
+          singleReport: this.singleReport
         })
           .then((res) => {
             if (res) {