3 Achegas dc8580a9b9 ... b3c15242d4

Autor SHA1 Mensaxe Data
  清行 b3c15242d4 添加资产品牌 %!s(int64=2) %!d(string=hai) anos
  清行 63614d5ed2 Merge branch 'master' of http://kpt.kptyun.cn:3000/Epans/modernDairy %!s(int64=2) %!d(string=hai) anos
  清行 c185201940 添加SAP编号显示 %!s(int64=2) %!d(string=hai) anos
Modificáronse 2 ficheiros con 7 adicións e 2 borrados
  1. 5 0
      src/views/basic/product/index.vue
  2. 2 2
      src/views/custom/outStock/index.vue

+ 5 - 0
src/views/basic/product/index.vue

@@ -115,6 +115,11 @@
                 <el-input ref="providerName" v-model="temp.providerName" />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="SAP编号" prop="sapcode">
+                <el-input ref="sapcode" v-model="temp.sapcode" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">

+ 2 - 2
src/views/custom/outStock/index.vue

@@ -2663,9 +2663,9 @@ export default {
               }, 2000)
             }
             const tHeader = [
-              '牧场', '领用单编号', '领用日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '实发数量', '单价', '总价', '库位', '供应商', '名称', '牧场设备编号', '领用类型', '领用部门', '领用人', '备注']
+              '牧场', '领用单编号', '领用日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '实发数量', '单价', '总价', '库位', '供应商', '名称', '牧场设备编号','资产品牌', '领用类型', '领用部门', '领用人', '备注']
             const filterVal = [
-              'pastureName', 'useForm', 'creatTime', 'partCode', 'partName', 'specification', 'brandName', 'unit', 'checkoutNumber', 'price', 'sumPrice', 'warehoseCode', 'providerName', 'eqName', 'eqCode', 'useTypeV', 'departmentName', 'appliname', 'note'
+              'pastureName', 'useForm', 'creatTime', 'partCode', 'partName', 'specification', 'brandName', 'unit', 'checkoutNumber', 'price', 'sumPrice', 'warehoseCode', 'providerName', 'eqName', 'eqCode', 'eqBrand','useTypeV', 'departmentName', 'appliname', 'note'
             ]
             const data1 = this.formatJson(filterVal, list1)
             excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.requestParam.parammaps.formType, autoWidth: true, bookType: 'xlsx' })