Browse Source

no message

linwenxin 8 months ago
parent
commit
451d0814d0

+ 11 - 0
src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryChargeManagement/selectGoods.vue

@@ -52,6 +52,7 @@
           </el-col>
           <el-col :xs="24" :sm="8" :lg="8" class="tr">
             <el-form-item label="">
+              <el-button size="small" @click="chongzhi">重置</el-button>
               <el-button size="small" type="primary" @click="getGoodsListByScreen">搜索</el-button>
             </el-form-item>
           </el-col>
@@ -187,6 +188,16 @@ export default {
         this.table_listTotal = res.data.total
       })
     },
+    chongzhi() {
+      this.tableScreenForm = {
+        goodsId: '',
+        goodsName: '',
+        goodsCode: '',
+        categoryId: '',
+        goodsSpecification: ''
+      }
+      this.getGoodsListByScreen()
+    },
     // 搜索
     getGoodsListByScreen() {
       this.handleTableCurrentChange(1)

+ 11 - 1
src/views/auxiliaryFittings/auxiliaryDataManagement/masterAuxiliaryMaterials/index.vue

@@ -292,6 +292,15 @@ export default {
                     },
                     {
                       columnAttributes: {
+                        label: '师傅库存',
+                        prop: 'manageWorkerStock'
+                      },
+                      render: (h, { row, column, index }) => {
+                        return <div style="padding: 0 10px">{row.manageWorkerStock}</div>
+                      }
+                    },
+                    {
+                      columnAttributes: {
                         label: '操作',
                         prop: ''
                       },
@@ -429,7 +438,8 @@ export default {
             websitGoodsId: item.goodsId,
             websitGoodsName: item.goodsName,
             workerGoodsId: '',
-            workerGoodsName: ''
+            workerGoodsName: '',
+            manageWorkerStock: { YES: '是', NO: '否' }[item.manageWorkerStock]
           })
         })
       this.close()