Bug Fix: 017,019,020,021

src/views/modules/order/order.vue

@@ -84,8 +84,17 @@
         prop="state"
         header-align="center"
         align="center"
+        :formatter="formatState"
         label="当前状态">
       </el-table-column>
+      <el-table-column
+        prop="approver"
+        header-align="center"
+        align="center"
+        :min-width="140"
+        :show-overflow-tooltip="true"
+        label="当前审批人">
+      </el-table-column>
       <el-table-column
         prop="completeDate"
         header-align="center"
@@ -238,6 +247,12 @@
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(id, disable)
         })
+      },
+      // 转换属性“状态”
+      formatState (row) {
+        if (!row.state) return ''
+        const item1 = this.optionsState.find((item) => item.code === row.state.toString())
+        return item1 ? item1.value : ''
       }
     }
   }

src/views/modules/product/template-chose-material.vue

@@ -11,7 +11,8 @@
         </el-form-item>
         <el-form-item>
           <el-button @click="search()">查询</el-button>
-          <el-button @click="visible = false" type="primary">返回</el-button>
+          <el-button type="primary" @click="addItems()">添加</el-button>
+<!--          <el-button @click="visible = false" type="primary">返回</el-button>-->
         </el-form-item>
       </el-form>
       <el-table
@@ -20,6 +21,9 @@
         v-loading="dataListLoading"
         @selection-change="selectionChangeHandle"
         style="width: 100%;">
+        <el-table-column
+          type="selection">
+        </el-table-column>
         <el-table-column
           label="序号"
           type="index"
@@ -62,16 +66,6 @@
           align="center"
           label="备注">
         </el-table-column>
-        <el-table-column
-          fixed="right"
-          header-align="center"
-          align="center"
-          width="50"
-          label="操作">
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="exportItem(scope.row)">添加</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <el-pagination
         @size-change="sizeChangeHandle"
@@ -150,6 +144,14 @@
       // 添加
       exportItem (item) {
         this.$emit('addItem', item)
+      },
+      addItems () {
+        if (this.dataListSelections.length === 0) {
+          this.$message.warning('请选择配料')
+          return
+        }
+        this.visible = false
+        this.$emit('addItems', this.dataListSelections)
       }
     }
   }

src/views/modules/product/template-chose.vue

@@ -11,8 +11,8 @@
         </el-form-item>
         <el-form-item>
           <el-button @click="search()">查询</el-button>
-          <el-button @click="visible = false" type="primary">返回</el-button>
           <el-button type="primary" @click="addItems()">添加</el-button>
+<!--          <el-button @click="visible = false" type="primary">返回</el-button>-->
         </el-form-item>
       </el-form>
       <el-table
@@ -66,16 +66,6 @@
           align="center"
           label="备注">
         </el-table-column>
-<!--        <el-table-column-->
-<!--          fixed="right"-->
-<!--          header-align="center"-->
-<!--          align="center"-->
-<!--          width="50"-->
-<!--          label="操作">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button type="text" size="small" @click="exportItem(scope.row)">添加</el-button>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
       </el-table>
       <el-pagination
         @size-change="sizeChangeHandle"

src/views/modules/tech/product-add-or-update.vue

@@ -12,12 +12,12 @@
                 <el-input v-model="dataForm.productName" :disabled="display" placeholder="产品名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="padding-left: 20px">
+            <el-col :span="8">
               <el-form-item label="产品规格" prop="productSpec">
                 <el-input v-model="dataForm.productSpec" :disabled="display" placeholder="产品规格"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="padding-left: 20px">
+            <el-col :span="8">
               <el-form-item label="产品类别" prop="productType">
                 <el-select
                   v-model="dataForm.productType"
@@ -54,18 +54,28 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="padding-left: 20px">
-              <el-form-item label="产品工艺" prop="techId">
-                <el-input v-if="display" v-model="dataForm.techName" disabled></el-input>
+            <el-col :span="16">
+              <el-form-item label="产品图纸" prop="drawingIdList">
+                <el-upload v-if="display"
+                           class="upload-demo"
+                           ref="upload"
+                           :multiple="true"
+                           action="#"
+                           accept="image/jpeg,image/gif,image/png"
+                           :on-preview="handlePreview"
+                           :file-list="fileList"
+                           :auto-upload="false">
+                </el-upload>
                 <el-select v-else
-                  v-model="dataForm.techId"
-                  :disabled="display"
+                           v-model="dataForm.drawingIdList"
                            filterable
-                  remote
-                           :remote-method="remoteTech"
-                  placeholder="请选择">
+                           multiple
+                           remote
+                           :remote-method="remoteDraw"
+                           placeholder="请选择"
+                style="width: 100%">
                   <el-option
-                    v-for="item in optionsTech"
+                    v-for="item in optionsDraw"
                     :key="item.code"
                     :label="item.value"
                     :value="item.code">
@@ -74,37 +84,9 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row class="my-row">
-            <el-form-item label="产品图纸" prop="drawingIdList">
-              <el-upload v-if="display"
-                class="upload-demo"
-                ref="upload"
-                :multiple="true"
-                action="#"
-                accept="image/jpeg,image/gif,image/png"
-                :on-preview="handlePreview"
-                :file-list="fileList"
-                :auto-upload="false">
-              </el-upload>
-              <el-select v-else
-                v-model="dataForm.drawingIdList"
-                         filterable
-                         multiple
-                         remote
-                         :remote-method="remoteDraw"
-                placeholder="请选择">
-                <el-option
-                  v-for="item in optionsDraw"
-                  :key="item.code"
-                  :label="item.value"
-                  :value="item.code">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-row>
           <el-row class="my-row">
             <el-form-item label="备注" prop="notes">
-              <el-input v-model="dataForm.notes" :disabled="display" placeholder="备注"></el-input>
+              <el-input type="textarea" v-model="dataForm.notes" :disabled="display"></el-input>
             </el-form-item>
           </el-row>
           <el-row class="my-row">
@@ -153,12 +135,6 @@
                   <el-input-number v-model="scope.row.cnt" :disabled="display" :min="1" style="width: 140px;"/>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop="unitName"
-                header-align="center"
-                align="center"
-                label="单位">
-              </el-table-column>
               <el-table-column
                 prop="notes"
                 header-align="center"
@@ -231,8 +207,8 @@
       <el-dialog title="图片预览" :visible.sync="previewVisible" width="50%">
         <img :src="previewPath" :alt="previewName" style="width:100%;height:100%" />
       </el-dialog>
-      <template-chose v-if="productListVisible" ref="productList" @addItem="addProductItem" />
-      <templateChoseMaterial v-if="materialListVisible" ref="materialList" @addItem="addMaterialItem"/>
+      <template-chose v-if="productListVisible" ref="productList" @addItems="addProductItems" />
+      <templateChoseMaterial v-if="materialListVisible" ref="materialList" @addItems="addMaterialItems"/>
     </div>
 </template>
 
@@ -284,7 +260,6 @@
           productSpec: [{ required: true, message: '产品规格不能为空', trigger: 'blur' }],
           productType: [{ required: true, message: '产品类别不能为空', trigger: 'change' }],
           source: [{ required: true, message: '产品来源不能为空', trigger: 'change' }],
-          techId: [{ required: true, message: '产品工艺不能为空', trigger: 'change' }],
           drawingIdList: [{ required: true, message: '产品图纸不能为空', trigger: 'blur' }]
         }
       }
@@ -424,13 +399,18 @@
           this.$refs.productList.init()
         })
       },
+      addProductItems (items) {
+        this.productDetails = []
+        items.forEach((item) => {
+          this.addProductItem(item)
+        })
+      },
       addProductItem (item) {
         this.productDetails.push({
           productId: item.productId,
           productName: item.productName,
           productSpec: item.productSpec,
           cnt: 1,
-          unitName: item.unitName,
           notes: item.notes
         })
       },
@@ -440,6 +420,12 @@
           this.$refs.materialList.init()
         })
       },
+      addMaterialItems (items) {
+        this.materialList = []
+        items.forEach((item) => {
+          this.addMaterialItem(item)
+        })
+      },
       addMaterialItem (item) {
         this.materialList.push({
           materialId: item.materialId,

src/views/modules/warehouse/stock-add-or-update.vue

@@ -65,7 +65,7 @@
       <el-row class="my-row">
         <el-col :span="24">
           <el-form-item label="备注" prop="notes">
-            <el-input v-model="dataForm.notes" placeholder="备注"></el-input>
+            <el-input type="textarea" v-model="dataForm.notes" placeholder="备注"></el-input>
           </el-form-item>
         </el-col>
       </el-row>

src/views/modules/warehouse/stock.vue

@@ -29,16 +29,18 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="-"
+          prop="materialCode"
           header-align="center"
           align="center"
+          min-width="180"
           label="编码">
         </el-table-column>
         <el-table-column
           prop="materialName"
           header-align="center"
           align="center"
-          min-width="100"
+          min-width="180"
+          :show-overflow-tooltip="true"
           label="名称">
         </el-table-column>
         <el-table-column
@@ -48,15 +50,24 @@
             label="类别">
         </el-table-column>
         <el-table-column
-          prop="-"
+          prop="isInventory"
           header-align="center"
           align="center"
+          :formatter="formatState"
           label="状态">
         </el-table-column>
+        <el-table-column
+          prop="lockCnt"
+          header-align="center"
+          align="center"
+          label="锁库数量">
+        </el-table-column>
         <el-table-column
           prop="specifications"
           header-align="center"
           align="center"
+          min-width="100"
+          :show-overflow-tooltip="true"
           label="规格">
         </el-table-column>
         <el-table-column
@@ -71,30 +82,12 @@
           align="center"
           label="库存">
         </el-table-column>
-        <el-table-column
-          prop="price"
-          header-align="center"
-          align="center"
-          label="单价">
-        </el-table-column>
         <el-table-column
           prop="amount"
           header-align="center"
           align="center"
           label="金额">
         </el-table-column>
-        <el-table-column
-          prop="-"
-          header-align="center"
-          align="center"
-          label="批次号">
-        </el-table-column>
-        <el-table-column
-          prop="-"
-          header-align="center"
-          align="center"
-          label="来源">
-        </el-table-column>
         <el-table-column
           prop="shelveName"
           header-align="center"
@@ -105,6 +98,7 @@
           prop="notes"
           header-align="center"
           align="center"
+          width="100"
           :show-overflow-tooltip="true"
           label="备注">
         </el-table-column>
@@ -221,6 +215,11 @@
         this.$nextTick(() => {
           this.$refs.addOrUpdate.init(id)
         })
+      },
+      // 转换属性“状态”
+      formatState (row) {
+        if (!row.lockCnt) return ''
+        return row.lockCnt === '0' ? '正常' : '盘点中'
       }
     }
   }