1

src/views/dashboard/Analysis.vue

@@ -3,14 +3,14 @@
     <index-chart v-if="indexStyle==1"></index-chart>
     <index-bdc v-if="indexStyle==2"></index-bdc>
     <index-task v-if="indexStyle==3"></index-task>
-    <div style="width: 100%;text-align: right;margin-top: 20px">
+    <!-- <div style="width: 100%;text-align: right;margin-top: 20px">
       请选择首页样式：
       <a-radio-group v-model="indexStyle">
         <a-radio :value="1">统计图表</a-radio>
         <a-radio :value="2">统计图表2</a-radio>
         <a-radio :value="3">任务表格</a-radio>
       </a-radio-group>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/views/dashboard/IndexChart.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="page-header-index-wide">
-    <a-row :gutter="24">
+    <!-- <a-row :gutter="24"> -->
       <!-- <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
         <chart-card :loading="loading" title="项目信息">
           <a-tooltip title="指标说明" slot="action">
@@ -17,7 +17,7 @@
           </template>
         </chart-card> 
       </a-col> -->
-      <a-col :sm="24" :md="12" :xl="8" :style="{ marginBottom: '24px' }">
+      <!-- <a-col :sm="24" :md="12" :xl="8" :style="{ marginBottom: '24px' }">
         <chart-card :loading="loading" title="任务总数" :total="tasksum">
           <a-tooltip title="指标说明" slot="action">
             <a-icon type="info-circle-o" />
@@ -46,9 +46,9 @@
           </div>
           <template slot="footer">总访问量 <span></span></template>
         </chart-card>
-      </a-col>
-    </a-row>
-
+      </a-col> -->
+    <!-- </a-row> -->
+<!-- 
     <a-card :loading="loading" :bordered="false" :body-style="{padding: '0'}">
       <div class="salesCard">
         <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
@@ -68,7 +68,7 @@
           </a-tab-pane>
         </a-tabs>
       </div>
-    </a-card>
+    </a-card> -->
 
     <a-row>
       <a-col :span="24">

src/views/production/materialprocurement/materialProcurementList.vue

@@ -57,7 +57,8 @@
               <a-col :md="4" :sm="24">
                 <a-form-item label="业务类型">
                   <a-select v-model="queryParam.type"  style='width:100%' >
-                    <a-select-option value='1'> 1</a-select-option>
+                    <a-select-option value='家装'> 家装</a-select-option>
+                    <a-select-option value='工装'> 工装</a-select-option>
                    </a-select>
                 </a-form-item>
               </a-col>
@@ -83,7 +84,7 @@
       <div class="table-operator">
         <a-button type="danger" size="small" @click='addList'>新增</a-button>
         <a-button  size="small" @click='addEdit'>修改</a-button>
-        <a-button size="small" @click="delecteList()">删除</a-button>
+        <a-button type="danger" size="small" @click="delecteList()">删除</a-button>
         <a-button  size="small" @click="detailList">详情</a-button>
         <a-button  size="small" @click="examineApprove">审批</a-button>
         <a-button  size="small" @click="abstainExamineApprove">弃审</a-button>
@@ -91,7 +92,7 @@
         <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"  @change="handleUploadChange" :action="importExcelUrl">
             <a-button  size="small">导入</a-button>
         </a-upload>
-        <a-button  size="small" @click="entireClose">整单关闭</a-button>
+        <a-button type="danger"  size="small" @click="entireClose">整单关闭</a-button>
         <a-button  size="small" @click="synchronizationData">同步请购单</a-button>
       </div>
   
@@ -418,8 +419,8 @@
               this.$message.warning("勾选数据里包含状态为已请购的数据，请重新选择！")
             }else{
                 this.$confirm({
-                  title: '确认整单关闭',
-                  content: '是否整单关闭选中数据?',
+                  title: '是否确认关闭?',
+                  content: '注：关闭后此单据将无法进行任何操作',
                   onOk:  ()=> {
                     var ids =  this.selectedRowKeys.toString()
                     alertModal.loading("执行中，请稍后！")
@@ -432,7 +433,7 @@
                         Message({
                           dangerouslyUseHTMLString: true,
                           message: str,
-                          type: 'info'
+                          type: 'success'
                         });
                       }else{
                         var arr = res.message.split(";");
@@ -520,6 +521,13 @@
                   //获取主表信息
                 this.$refs.materialProcurementDetail.getMainData(record.id)
               },
+              // click: () => {
+              //   this.selectedRowKeys = []
+              //   this.selectedRows = []
+              //   this.selectedRowKeys.push(record.id)
+              //   this.selectedRows.push(record)
+                
+              // },
             }
           }       
        },
@@ -588,7 +596,7 @@
                       Message({
                         dangerouslyUseHTMLString: true,
                         message: str,
-                        type: 'info'
+                        type: 'success'
                       });
                     }else{
                       debugger

src/views/production/mrp/mrp.vue

@@ -41,11 +41,11 @@
                   <a-col :md="4" :sm="24">
                     <a-form-item label="单据状态">
                       <a-select v-model="queryParam.state"  style='width:100%' >
-                        <a-select-option value='编写中'> 编写中</a-select-option>
-                        <a-select-option value='已批准'> 已批准</a-select-option>
-                        <a-select-option value='已批准'> 已批准</a-select-option>
+                        <a-select-option value='开立'> 开立</a-select-option>
+                        <a-select-option value='审核'> 审核</a-select-option>
                         <a-select-option value='已转库'> 已转库</a-select-option>
                         <a-select-option value='已请购'> 已请购</a-select-option>
+                        <a-select-option value='已生单'> 已生单</a-select-option>
                        </a-select>
                     </a-form-item>
                   </a-col>
@@ -107,7 +107,7 @@
             <a-button type="danger" size="small" @click='operationList'>运算</a-button>
             <a-button  size="small" @click='editList'>修改</a-button>
             <a-button  size="small" @click='detailList'>详情</a-button>
-            <a-button  size="small" @click='DelectList'>删除</a-button>
+            <a-button type="danger" size="small" @click='DelectList'>删除</a-button>
             <a-button  size="small" @click='examine'>审批</a-button>
             <a-button  size="small" @click='abandonExamine'>弃审</a-button>
           </div>

src/views/production/safetyStock/encoderList.vue

@@ -69,7 +69,7 @@
           <div class="table-operator">
             <a-button  type="danger" size="small" @click='addList'>新增</a-button>
             <a-button  size="small" @click='editList'>修改</a-button>
-            <a-button size="small" @click="delectList">删除</a-button>
+            <a-button type="danger" size="small" @click="delectList">删除</a-button>
             
             <a-button  size="small" @click="detailList">详情</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" @change="handleUploadChange"  :action="fileUpload">
@@ -149,13 +149,7 @@
                     return parseInt(index)+1;
                   }
                 },
-                {
-                  title: 'u9编码',
-                  align:"center",
-                  dataIndex: 'inventoryCode',
-                  ellipsis: true,
-    
-                }, {
+               {
                   title: '料品名称',
                   align:"center",
                   dataIndex: 'inventoryName',
@@ -216,16 +210,22 @@
                   align:"center",
                   dataIndex: 'sync',
                   ellipsis: true,
-                  customRender:function (t, r, index) {
-                    if(t == '是'){
-                      return t +"（"+r.inventoryCode+"）";
-                    }else{
-                      return t;
-                    }
+                  // customRender:function (t, r, index) {
+                  //   if(t == '是'){
+                  //     return t +"（"+r.inventoryCode+"）";
+                  //   }else{
+                  //     return t;
+                  //   }
                     
-                  }
+                  // }
     
-                },
+                }, {
+                  title: 'u9编码',
+                  align:"center",
+                  dataIndex: 'inventoryCode',
+                  ellipsis: true,
+    
+                }, 
               ],
               url: {
                     list: "/encoder/encoder/list",

src/views/production/safetyStock/safetyStockList.vue

@@ -65,7 +65,7 @@
           <div class="table-operator">
             <a-button  type="danger" size="small" @click='addList'>新增</a-button>
             <a-button  size="small" @click='editList'>修改</a-button>
-            <a-button size="small" @click="delectList">删除</a-button>
+            <a-button type="danger" size="small" @click="delectList">删除</a-button>
             <a-button  size="small" @click="detailList">详情</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" @change="handleUploadChange"  :action="importExcelUrl">
                <a-button  size="small">导入</a-button>