领料追踪优化，my-modal组件优化

src/components/my-modal-form/my-modal-form.vue

@@ -406,7 +406,7 @@
 				title="图片查看"
 				>
 				<div>
-					<img :src="imgMddalUrl" alt="" />
+					<img style="max-width:100%" :src="imgMddalUrl" alt="" />
 				</div>
 			</Modal>
 		</Modal>
@@ -834,7 +834,7 @@ export default {
 		if (!this.modal) {
 			this.cancel()
 		}
-		this.$set(this, 'formData', this.data)
+		// this.$set(this, 'formData', this.data)
 		// 防止input type为number时绑定数据 校验失败
 		if (this.isFirst) {
 			if (this.modal && (this.type === 'edit' || this.type === 'form')) {

src/locale/lang/zh-CN.js

@@ -25,7 +25,7 @@ export default {
   inventory_record_detail: '盘点明细',
   inventory: '发起盘点',
   store_report: '* 库存报表',
-  store_out_manage: '出库管理',
+  store_out_manage: '* 出库管理',
   apply_manage: '领料管理',
   store_out_record: '出库记录',
   provider_shipment_manage: '出货管理',
@@ -34,7 +34,7 @@ export default {
   other_apply: '发起申请',
   other_manage: '其他',
   store_material: '物料库存',
-  material_apply_detail: '物料申购',
+  material_apply_detail: '* 物料申购',
   tag_new: '新建标签',
   store_update: '标签统计',
   tag: '标签管理',
@@ -43,7 +43,7 @@ export default {
   material_stranded: '滞留物料',
   store_warning: '库存预警',
   technician_reprot: '技术员报表',
-  picking_tracking: '指定领料追踪',
+  picking_tracking: '* 指定领料追踪',
   material_pay_detail: '付款详情',
   error_401: '暂无权限',
   error_tag: '异常标签查询',

src/view/index/msg/msg.vue

@@ -263,7 +263,6 @@ export default {
                           id: params.row.id
                         }).then(res => {
                           if (res.code === 0) {
-                            alert(111)
                             _this.$Message.info(res.msg || '操作成功')
                             _this.$store.commit('setMsgChange', new Date().getTime())
                             _this.getList()

src/view/material-manege/material-apply-detail/material-apply-detail.vue

@@ -262,7 +262,12 @@ export default {
           //   title: '用途',
           //   key: 'purpose',
           //   minWidth: 150
-        }
+        },
+        {
+          title: '申购说明',
+          key: 'applyAccount',
+          minWidth: 150
+        },
       ],
       tableFilter: [
         {
@@ -481,7 +486,12 @@ export default {
                 title: '合同状态',
                 key: 'purContractState',
                 minWidth: 150
-              }
+              },
+              {
+                title: '申购说明',
+                key: 'applyAccount',
+                minWidth: 150
+              },
             ]
           } else {
             this.columns = [
@@ -553,7 +563,12 @@ export default {
                 //   title: '用途',
                 //   key: 'purpose',
                 //   minWidth: 150
-              }
+              },
+              {
+                title: '申购说明',
+                key: 'applyAccount',
+                minWidth: 150
+              },
             ]
           }
           axios
@@ -612,6 +627,7 @@ export default {
         })
     },
     getList() {
+      this.$Spin.show();
       axios
         .post('/cloudApi/applyPurchase/page', {
           ...this.params,
@@ -624,6 +640,7 @@ export default {
         .then(res => {
           this.data = res.data.data.records
           this.params.total = res.data.data.total
+          this.$Spin.hide();
         })
     },
     addPurchase() {

src/view/material-manege/material-apply/material-apply.vue

@@ -90,7 +90,7 @@ export default {
           minWidth: 150
         },
         {
-          title: '请购原因',
+          title: '申购说明',
           key: 'applyAccount',
           minWidth: 200
         }

src/view/provider-manage/provider-shipment-manage/my-modal-old.vue

@@ -682,7 +682,7 @@ export default {
   },
   methods: {
     test () {
-      alert(123)
+      
     },
     /* 移出文件 */
     importCancel () {

src/view/provider-manage/provider-shipment-manage/my-modal2.vue

@@ -609,7 +609,7 @@ export default {
   },
   methods: {
     test () {
-      alert(123)
+      
     },
     /* 移出文件 */
     importCancel () {

src/view/store-out-manage/picking-tracking/picking-tracking.vue

@@ -147,6 +147,7 @@ export default {
           title: '指定领用面料',
           key: 'realName',
           minWidth: 200,
+          className:"bg-fa",
           align: 'center'
         },
         {
@@ -181,6 +182,7 @@ export default {
           title: '指定领用卷数',
           key: 'appointNum',
           minWidth: 120,
+          className:"bg-fa",
           align: 'center',
           render: (h, params) => {
             if (params.row.list[0].appointNum !== void 0) {
@@ -209,6 +211,7 @@ export default {
           title: '实际领用卷数',
           key: 'actualNum',
           minWidth: 120,
+          className:"bg-fa",
           align: 'center',
           render: (h, params) => {
             if (params.row.list[0].actualNum !== void 0) {
@@ -238,7 +241,7 @@ export default {
           key: 'appointNotClaimedNum',
           minWidth: 135,
           align: 'center',
-          className: 'add-color',
+          className: 'add-color bg-fa',
           render: (h, params) => {
             if (params.row.list[0].appointNotClaimedNum !== void 0) {
               return h(
@@ -264,7 +267,7 @@ export default {
                           on: {
                             click(e) {
                               e.stopPropagation()
-                              _this.pickingType = '1'
+                              _this.pickingType = '2'
                               _this.detailsTitle = '指定领料未领卷数'
                               _this.rowData = item
                               _this.openDetails = true
@@ -287,7 +290,7 @@ export default {
           key: 'additionalNum',
           minWidth: 120,
           align: 'center',
-          className: 'add-color',
+          className: 'add-color bg-fa',
           render: (h, params) => {
             if (params.row.list[0].additionalNum !== void 0) {
               return h(
@@ -313,7 +316,7 @@ export default {
                           on: {
                             click(e) {
                               e.stopPropagation()
-                              _this.pickingType = '2'
+                              _this.pickingType = '3'
                               _this.detailsTitle = '额外领料卷数'
                               _this.rowData = item
                               _this.openDetails = true
@@ -387,34 +390,34 @@ export default {
             }
           }
         },
-        {
-          title: '指定领料面积',
-          key: 'appointArea',
-          minWidth: 120,
-          align: 'center',
-          render: (h, params) => {
-            if (params.row.list[0].appointArea !== void 0) {
-              return h(
-                'div',
-                {
-                  attrs: {
-                    class: 'subCol'
-                  }
-                },
-                [
-                  h(
-                    'ul',
-                    params.row.list.map(item => {
-                      return h('li', {}, item.appointArea)
-                    })
-                  )
-                ]
-              )
-            } else {
-              return h('div', [h('span', '----')])
-            }
-          }
-        },
+        // {
+        //   title: '指定领料面积',
+        //   key: 'appointArea',
+        //   minWidth: 120,
+        //   align: 'center',
+        //   render: (h, params) => {
+        //     if (params.row.list[0].appointArea !== void 0) {
+        //       return h(
+        //         'div',
+        //         {
+        //           attrs: {
+        //             class: 'subCol'
+        //           }
+        //         },
+        //         [
+        //           h(
+        //             'ul',
+        //             params.row.list.map(item => {
+        //               return h('li', {}, item.appointArea)
+        //             })
+        //           )
+        //         ]
+        //       )
+        //     } else {
+        //       return h('div', [h('span', '----')])
+        //     }
+        //   }
+        // },
         {
           title: '实际领料米数',
           key: 'actualMeter',
@@ -444,8 +447,9 @@ export default {
           }
         },
         {
-          title: '排班面数',
+          title: '排班面积', 
           key: 'planArea',
+          className:"bg-fa",
           minWidth: 120,
           align: 'center',
           render: (h, params) => {
@@ -474,6 +478,7 @@ export default {
         {
           title: '指定领料面积',
           key: 'appointArea',
+          className:"bg-fa",
           minWidth: 120,
           align: 'center',
           render: (h, params) => {
@@ -502,6 +507,7 @@ export default {
         {
           title: '实际领料面积',
           key: 'actualArea',
+          className:"bg-fa",
           minWidth: 120,
           align: 'center',
           render: (h, params) => {
@@ -560,7 +566,7 @@ export default {
           key: 'actualOutputRatio',
           minWidth: 120,
           align: 'center',
-          className: 'add-color',
+          className: 'add-color bg-fa',
           render: (h, params) => {
             if (params.row.list[0].actualOutputRatio !== void 0) {
               return h(
@@ -752,12 +758,17 @@ export default {
   }
 }
 </script>
-
+<style>
+.bg-fa{
+    background: #f8f8f9!important;
+  }
+</style>
 <style lang="less" scoped>
 .container {
   height: 100%;
   display: flex;
   flex-direction: column;
+  
   .tab-nav {
     display: flex;
     align-items: center;
@@ -918,7 +929,7 @@ export default {
     margin: 0 -18px;
     list-style: none;
     padding: 9px;
-    border-bottom: 1px solid #ccc;
+    border-bottom: 1px solid #e8eaec;
     overflow-x: hidden;
     height: 48px; /*看单元格内容*/
     padding-left: 18px;
@@ -929,7 +940,7 @@ export default {
   }
   .ivu-table-row {
     td {
-      border-right: 1px solid #ccc;
+      // border-right: 1px solid #ccc;
     }
   }
   .add-color {