From a9d0660617dbb3caba25fae4dc17dc9eca5b93bc Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 10:58:50 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=9E=8B=E5=8F=B7=E8=A7=84=E6=A0=BC?=
 =?UTF-8?q?=E7=94=A8|=E9=9A=94=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wpm/mlog_dept10.vue | 2 +-
 src/views/wpm/mlog_dept7.vue  | 2 +-
 src/views/wpm/worktask.vue    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wpm/mlog_dept10.vue b/src/views/wpm/mlog_dept10.vue
index 19860b1a..1901c754 100644
--- a/src/views/wpm/mlog_dept10.vue
+++ b/src/views/wpm/mlog_dept10.vue
@@ -24,7 +24,7 @@
                                     <template #default="scope">
                                         <span v-if="scope.row.material_out_">{{
                                             scope.row.material_out_.specification
-                                        }}-{{ scope.row.material_out_.model }}</span>
+                                        }}|{{ scope.row.material_out_.model }}</span>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="任务编号" prop="number" width="140" show-overflow-tooltip>
diff --git a/src/views/wpm/mlog_dept7.vue b/src/views/wpm/mlog_dept7.vue
index 1f4d95d1..3f2302f8 100644
--- a/src/views/wpm/mlog_dept7.vue
+++ b/src/views/wpm/mlog_dept7.vue
@@ -24,7 +24,7 @@
                                     <template #default="scope">
                                         <span v-if="scope.row.material_out_">{{
                                             scope.row.material_out_.specification
-                                        }}-{{ scope.row.material_out_.model }}</span>
+                                        }}|{{ scope.row.material_out_.model }}</span>
                                     </template>
                                 </el-table-column>
                                 <el-table-column label="任务编号" prop="number" width="140" show-overflow-tooltip>
diff --git a/src/views/wpm/worktask.vue b/src/views/wpm/worktask.vue
index e56c4813..5026b0ac 100644
--- a/src/views/wpm/worktask.vue
+++ b/src/views/wpm/worktask.vue
@@ -225,7 +225,7 @@
                   <template #default="scope">
                     <span v-if="scope.row.material_out_">{{
                       scope.row.material_out_.specification
-                    }}</span>
+                    }}|{{ scope.row.material_out_.model }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column label="计划量" prop="count"> </el-table-column>

From 9182c99ba16498eda1074409ee0c9934fc7fca16 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 13:46:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E9=83=A8=E5=88=86=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0v-auth?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pum/plan.vue     | 2 +-
 src/views/pum/supplier.vue | 2 +-
 src/views/sam/customer.vue | 2 +-
 src/views/sam/order.vue    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/pum/plan.vue b/src/views/pum/plan.vue
index 6c5de0cc..e4eba265 100644
--- a/src/views/pum/plan.vue
+++ b/src/views/pum/plan.vue
@@ -2,7 +2,7 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'pu_plan.create'">新增</el-button>
       </div>
       <div class="right-panel">
         <el-input v-model="query.search" placeholder="计划编号" clearable style="margin-right: 5px;"></el-input>
diff --git a/src/views/pum/supplier.vue b/src/views/pum/supplier.vue
index 8fefccfb..e571a1af 100644
--- a/src/views/pum/supplier.vue
+++ b/src/views/pum/supplier.vue
@@ -2,7 +2,7 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'supplier.create'">新增</el-button>
       </div>
       <div class="right-panel">
 
diff --git a/src/views/sam/customer.vue b/src/views/sam/customer.vue
index 3a455819..2340760c 100644
--- a/src/views/sam/customer.vue
+++ b/src/views/sam/customer.vue
@@ -2,7 +2,7 @@
     <el-container>
       <el-header>
         <div class="left-panel">
-          <el-button type="primary" icon="el-icon-plus" @click="add">新增</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'customer.create'">新增</el-button>
         </div>
         <div class="right-panel">
           <el-input
diff --git a/src/views/sam/order.vue b/src/views/sam/order.vue
index bb8400c9..b826ff40 100644
--- a/src/views/sam/order.vue
+++ b/src/views/sam/order.vue
@@ -2,7 +2,7 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'order.delete'">新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'order.create'">新增</el-button>
       </div>
       <div class="right-panel">
         <el-input v-model="query.search" placeholder="名称" clearable style="margin-right: 5px;"></el-input>

From 222d766c1165ef1a035a5bf2f3ad212685710947 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 13:46:54 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=89=A9=E6=96=99=E6=89=B9=E6=AC=A1=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inm/mioitem.vue      |  15 ++-
 src/views/inm/mioitem_form.vue | 220 ++++++++++++++++++++++-----------
 2 files changed, 152 insertions(+), 83 deletions(-)

diff --git a/src/views/inm/mioitem.vue b/src/views/inm/mioitem.vue
index 539e145e..add29f99 100644
--- a/src/views/inm/mioitem.vue
+++ b/src/views/inm/mioitem.vue
@@ -28,8 +28,7 @@
                 <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params" hidePagination hideDo>
                     <el-table-column type="index" width="50" />
                     <el-table-column label="物料" prop="material" show-overflow-tooltip>
-                        <template #default="scope">
-                            <span v-if="scope.row.material_"> {{ scope.row.material_.name }}</span>
+                        <template #default="scope">{{ scope.row.material_name }}
                         </template>
                     </el-table-column>
                     <el-table-column label="批次号" prop="batch">
@@ -45,15 +44,15 @@
                     <el-table-column label="操作" fixed="right" align="center" width="100px">
                         <template #default="scope">
                             <!-- <el-link type="primary" @click="table_check(scope.row)" v-if="mioObj.state==20&&mioObj.type=='do_in'"> -->
-                            <el-link type="primary" @click="table_check(scope.row)" v-if="scope.row.test_date==null" v-auth="'mioitem.test'">
+                            <el-button link type="primary" @click="table_check(scope.row)" v-if="scope.row.test_date==null" v-auth="'mioitem.test'">
                                 检验
-                            </el-link>
-                            <el-link type="primary" @click="check_Show(scope.row)" v-else>
+                            </el-button>
+                            <el-button link type="primary" @click="check_Show(scope.row)" v-else>
                                 查看
-                            </el-link>
-                            <el-link type="danger" @click="table_del(scope.row)" v-if="scope.row.test_date==null">
+                            </el-button>
+                            <el-button link type="danger" @click="table_del(scope.row)" v-if="scope.row.test_date==null">
                                 删除
-                            </el-link>
+                            </el-button>
                         </template>
                     </el-table-column>
                 </scTable>
diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index 120027dd..6c31b835 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -1,75 +1,134 @@
 <template>
-    <el-dialog :title="titleMap[form.type]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-        <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
-            <el-form-item label="物料">
-                <el-select v-model="selectMaterial" value-key="id" clearable style="width: 100%;"
-                    @change="selectMaterialChange">
-                    <el-option v-for="item in materialOptions" :key="item.id" :label="item.number" :value="item">
-                        <span style="float: left">{{ item.full_name }}</span>
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="批次号">
-                <!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> -->
-                <el-select v-model="form.batch" value-key="id" filterable allow-create clearable style="width: 100%;" :disabled="inputBatchDisable">
-                    <el-option 
-                    v-for="item in wbatchOptions" 
-                    :key="item" 
-                    :label="item" 
-                    :value="item">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="仓库已有批次">
-                <el-select v-model="selectBatch" value-key="id" clearable style="width: 100%;" @change="selectBatchChange"
-                    @clear="selectBatchClear" :disabled="selectBatchDisable">
-                    <el-option v-for="item in batchOptions" :key="item.id" :label="item.batch" :value="item">
-                        <span style="float: left">{{ item.batch }}</span>
-                        <span style="
-                        float: right;
-                        color: var(--el-text-color-secondary);
-                        font-size: 13px;
-                        ">{{ item.count }} -- {{ item.warehouse_name }}</span>
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="仓库">
-                <el-select v-model="form.warehouse" clearable style="width: 100%;" :disabled="warehouseDisable">
-                    <el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name"
-                        :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="数量">
-                <el-input-number v-model="form.count" :min="1" style="width: 100%;" />
-            </el-form-item>
-            <div v-if="assembShow">
-                <el-row v-for="item in components" v-bind:key="item" style="margin-bottom:8px">
-                    <el-col :span="12">
-                        {{ item.number }} - {{ item.name }}
-                    </el-col>
-                    <el-col :span="12">
-                        <el-select v-model="item.batch" clearable style="width: 100%;">
-                            <el-option v-for="itemx in item.batchOptions" :key="itemx.id" :label="itemx.batch"
-                                :value="itemx.batch">
-                                <span style="float: left">{{ itemx.batch }}</span>
-                                <span style="
-          float: right;
-          color: var(--el-text-color-secondary);
-          font-size: 13px;
-        ">{{ itemx.count }}</span>
-                            </el-option>
-                        </el-select>
-                    </el-col>
-                </el-row>
-            </div>
-        </el-form>
-        <template #footer>
-            <el-button type="primary" :loading="isSaveing" @click="submit">
-                保存
-            </el-button>
-            <el-button @click="dialogVisible = false">取消</el-button>
-        </template>
-    </el-dialog>
+  <el-dialog
+    :title="titleMap[form.type]"
+    v-model="visible"
+    :size="1000"
+    destroy-on-close
+    @closed="$emit('closed')"
+  >
+    <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="物料">
+        <el-select
+          v-model="selectMaterial"
+          value-key="id"
+          clearable
+          filterable
+          style="width: 100%"
+          @change="selectMaterialChange"
+        >
+          <el-option
+            v-for="item in materialOptions"
+            :key="item.id"
+            :label="item.full_name"
+            :value="item.id"
+          >
+            <span style="float: left">{{ item.full_name }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="批次号">
+        <!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> -->
+        <el-select
+          v-model="form.batch"
+          value-key="id"
+          filterable
+          allow-create
+          clearable
+          style="width: 100%"
+          :disabled="inputBatchDisable"
+        >
+          <el-option
+            v-for="item in wbatchOptions"
+            :key="item"
+            :label="item"
+            :value="item"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库已有批次">
+        <el-select
+          v-model="selectBatch"
+          value-key="id"
+          clearable
+          style="width: 100%"
+          @change="selectBatchChange"
+          @clear="selectBatchClear"
+          :disabled="selectBatchDisable"
+        >
+          <el-option
+            v-for="item in batchOptions"
+            :key="item.id"
+            :label="item.batch"
+            :value="item"
+          >
+            <span style="float: left">{{ item.batch }}</span>
+            <span
+              style="
+                float: right;
+                color: var(--el-text-color-secondary);
+                font-size: 13px;
+              "
+              >{{ item.count }} -- {{ item.warehouse_name }}</span
+            >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="仓库">
+        <el-select
+          v-model="form.warehouse"
+          clearable
+          style="width: 100%"
+          :disabled="warehouseDisable"
+        >
+          <el-option
+            v-for="item in warehouseOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数量">
+        <el-input-number v-model="form.count" :min="1" style="width: 100%" />
+      </el-form-item>
+      <div v-if="assembShow">
+        <el-row
+          v-for="item in components"
+          v-bind:key="item"
+          style="margin-bottom: 8px"
+        >
+          <el-col :span="12"> {{ item.number }} - {{ item.name }} </el-col>
+          <el-col :span="12">
+            <el-select v-model="item.batch" clearable style="width: 100%">
+              <el-option
+                v-for="itemx in item.batchOptions"
+                :key="itemx.id"
+                :label="itemx.batch"
+                :value="itemx.batch"
+              >
+                <span style="float: left">{{ itemx.batch }}</span>
+                <span
+                  style="
+                    float: right;
+                    color: var(--el-text-color-secondary);
+                    font-size: 13px;
+                  "
+                  >{{ itemx.count }}</span
+                >
+              </el-option>
+            </el-select>
+          </el-col>
+        </el-row>
+      </div>
+    </el-form>
+    <template #footer>
+      <el-button type="primary" :loading="isSaveing" @click="submit">
+        保存
+      </el-button>
+      <el-button @click="dialogVisible = false">取消</el-button>
+    </template>
+  </el-dialog>
 </template>
 <script>
 const defaultForm = {
@@ -132,10 +191,21 @@ export default {
         },
         //获取车间物料批次号
         getBatchs(){
-            let that = this;
-            this.$API.wpm.wmaterial.batchs.req({belong_dept_name:this.belongDeptName}).then(res=>{
-                that.wbatchOptions = res;
-            });
+            let wbatchs = []
+            if(this.belongDeptName !=null && this.belongDeptName != undefined && this.belongDeptName != ''){
+                this.$API.wpm.wmaterial.list.req({
+                    "belong_dept__name": this.belongDeptName,
+                    "count__gte": 1,
+                    "page": 0
+                }).then(res=>{
+                    res.forEach(item => {
+                        if (!wbatchs.includes(item.batch)) {
+                            wbatchs.push(item.batch);
+                        }
+                    });
+                    this.wbatchOptions = wbatchs
+                })
+            }
         },
         getMaterialOptions() {
             var type = this.form.type;

From 8f79680b2103cce954949be77b6cf1d36f8580e5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 22 Dec 2023 14:04:33 +0800
Subject: [PATCH 4/4] fix: selectMaterialChange bug

---
 src/views/inm/mioitem_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/inm/mioitem_form.vue b/src/views/inm/mioitem_form.vue
index 6c31b835..8c2b0043 100644
--- a/src/views/inm/mioitem_form.vue
+++ b/src/views/inm/mioitem_form.vue
@@ -20,7 +20,7 @@
             v-for="item in materialOptions"
             :key="item.id"
             :label="item.full_name"
-            :value="item.id"
+            :value="item"
           >
             <span style="float: left">{{ item.full_name }}</span>
           </el-option>