Merge branch 'master' of http://gogs.langye.net:3000/wangyifang/patrol-wzgl-web

src/views/books/index.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="map" id="map" :style="{'height':mapHeight+'px'}">
       <div class="teamsTab">
-        <span>防汛队伍：{{this.makerObj.teams.length}}</span>
+        <span>防汛队伍：{{makerObj.teams.length}}</span>
         <span>在册人员：{{totalPerson}}</span>
       </div>
       <div class="tabs">
@@ -108,119 +108,101 @@
             fixed: 'left',
             width: 80
           },
-          // {
-          //   label: "关联仓库",
-          //   width: 120,
-          //   prop: 'guanliancangku',
-          //   align: 'center',
-          // },
-          // {
-          //   label: "仓库名称",
-          //   width: 220,
-          //   prop: 'cangkumingcheng',
-          //   align: 'left',
-          // },
           {
-            label: "物资代码",
+            label: "物资编码",
             width: 120,
-            prop: 'wuzidaima',
-            align: 'left'
+            prop: 'wuzibianma',
+            align: 'center',
           },
           {
-            label: "现物资名称",
-            width: 120,
-            prop: 'xianwuzimingcheng',
-            align: 'center'
-          },
-          {
-            label: "原物资名称",
-            width: 120,
-            prop: 'yuanwuzimingcheng',
+            label: "资产名称",
+            width: 180,
+            prop: 'zichanmingcheng',
             align: 'left'
           },
           {
-            label: "规格型号",
-            width: 120,
-            prop: 'guigexinghao',
-            align: 'center'
-          },
-          {
-            label: "数量",
-            width: 80,
-            prop: 'shuliang',
-            align: 'center'
-          },
-          {
-            label: "单位",
-            width: 80,
-            prop: 'danwei',
-            align: 'center'
-          },
-          {
-            label: "价值（元）",
-            width: 80,
-            prop: 'jiazhiyuan',
+            label: "物资类型",
+            width: 180,
+            prop: 'wuzileixing',
             align: 'center'
           },
           {
-            label: "生产日期",
-            width: 120,
-            prop: 'shengchanriqi',
-            align: 'center'
+            label: "规格型号",
+            width: 180,
+            prop: 'guigexinghao',
+            align: 'left'
           },
           {
-            label: "入库日期",
-            width: 120,
-            prop: 'rukuriqi',
+            label: "分类",
+            width: 180,
+            prop: 'fenlei',
             align: 'center'
           },
+          // {
+          //   label: "状态",
+          //   width: 180,
+          //   prop: 'zhuangtai',
+          //   align: 'center'
+          // },
           {
-            label: "储备年限",
-            width: 80,
-            prop: 'chubeinianxian',
+            label: "计量单位",
+            width: 180,
+            prop: 'jiliangdanwei',
             align: 'center'
           },
           {
-            label: "状态",
-            width: 80,
-            prop: 'zhuangtai',
+            label: "所在仓库",
+            width: 180,
+            prop: 'storages_id_materialstorages_id_relation.cangkumingcheng',
             align: 'center'
           },
+          // {
+          //   label: "所在货架",
+          //   width: 180,
+          //   prop: 'suozaihuojia',
+          //   align: 'center'
+          // },
           {
-            label: "资金来源",
-            width: 120,
-            prop: 'zijinlaiyuan',
+            label: "入库时间",
+            width: 180,
+            prop: 'rukushijian',
             align: 'center'
           },
+          // {
+          //   label: "资产原值",
+          //   width: 180,
+          //   prop: 'zichanyuanzhi',
+          //   align: 'center'
+          // },
           {
-            label: "储备方式",
-            width: 120,
-            prop: 'chubeifangshi',
+            label: "使用年限",
+            width: 180,
+            prop: 'shiyongnianxian',
             align: 'center'
           },
+          // {
+          //   label: "使用部门",
+          //   width: 180,
+          //   prop: 'shiyongbumen',
+          //   align: 'center'
+          // },
           {
-            label: "储备地点",
+            label: "是否为固定资产",
             width: 180,
-            prop: 'chubeididian',
-            align: 'left'
+            prop: 'shifouweigudingzichan',
+            align: 'center'
+          },
+          {
+            label: "库存",
+            width: 180,
+            prop: 'inventorys_total',
+            align: 'center'
           },
           {
             label: "备注",
-            width: 180,
+            width: 240,
             prop: 'beizhu',
             align: 'left'
-          },
-          {
-            label: "储备层级",
-            width: 120,
-            prop: 'chubeicengji',
-            align: 'left'
-          },
-          {
-            label: "是否展示",
-            width: 120,
-            prop: 'shifouzhanshi',
-            align: 'left'
           }
         ]
       }
@@ -319,7 +301,7 @@
         await index({
           page: 1,
           page_size: 9999,
-          table_name: 'flood_storages',
+          table_name: 'materialstorages',
           filter: [{
             key: 'quyu_id',
             op: 'eq',
@@ -346,9 +328,9 @@
         const res = await index({
           page: 1,
           page_size: 9999,
-          table_name: "flood_materials",
+          table_name: "material_infos",
           filter: [{
-            "key": "guanliancangku",
+            "key": "storages_id",
             "op": "eq",
             "value": id
           }],

src/views/storages/components/addStorage.vue

@@ -141,9 +141,9 @@
           </div>
           <div class="xy-table-item-content">
             <el-upload class="upload-demo" :action="action" :on-success="handleSuccess" :on-remove="handleRemove"
-              multiple :limit="10" :file-list="fileList">
+              multiple :limit="1" :file-list="fileList">
               <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+              <!-- <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div> -->
             </el-upload>
           </div>
         </div>