编码器同步U9

src/components/page/GlobalFooter.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="footer">
-    <div class="links">
+    <!-- <div class="links">
       <a href="https://blog.csdn.net/qq_40032778" target="_blank">NBCIO 首页</a>
       <a href="https://ant.design/">Ant Design</a>
       <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/">Vue Antd</a>
@@ -9,7 +9,7 @@
       Copyright
       <a-icon type="copyright"/>
       2022 <span>NBCIO 亿事达出品 QQ群:655054809</span>
-    </div>
+    </div> -->
   </div>
 </template>
 

src/views/production/safetyStock/encoderList.vue

@@ -65,11 +65,13 @@
             <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  size="small" @click="detailList">详情</a-button>
             <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" @change="handleUploadChange"  :action="fileUpload">
                <a-button  size="small">导入</a-button>
             </a-upload>
             <a-button size="small" @click="exportList('编码器列表')">导出</a-button>
+            <a-button size="small" @click="syncList">同步至u9</a-button>
           </div>
       
           <!-- table区域-begin -->
@@ -82,12 +84,12 @@
               :columns="columns"
               :dataSource="dataSource"
               :pagination="ipagination"
-              :scroll="{ x: 1500, y: 300 }"
+              
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
               @change="handleTableChange"
               :customRow ="clickRow"
               >
-      
+      <!-- :scroll="{ x: 1500, y: 300 }" -->
             </a-table>
           </div>
           <AddEncoder ref="AddEncoder" @ok="getTableList"></AddEncoder>
@@ -191,6 +193,19 @@
                   ellipsis: true,
     
                 },
+                {
+                  title: '料品属性',
+                  align:"center",
+                  dataIndex: 'attribute',
+                  ellipsis: true,
+    
+                }, {
+                  title: '是否同步',
+                  align:"center",
+                  dataIndex: 'sync',
+                  ellipsis: true,
+    
+                },
               ],
               url: {
                     list: "/encoder/encoder/list",
@@ -291,6 +306,31 @@
                 }
                 
             },
+            //同步
+            syncList(){
+              if(this.selectedRowKeys.length==0){
+                this.$message.warning('请勾选数据！')
+              }else{
+                this.$confirm({
+                  title: '确认同步',
+                  content: '是否同步选中数据?',
+                  onOk:  ()=> {
+                    var ids =  this.selectedRowKeys.toString()
+                    var that = this
+                    alertModal.loading("执行中，请稍后！")
+                    deleteAction('/encoder/encoder/syncBatch', {ids: ids}).then((res) => {
+                      alertModal.closeLoading();
+                      if (res.success) {
+                        this.$message.success('同步成功！');
+                        this.getTableList()
+                      } else {
+                        this.$message.error(res.message);
+                      }
+                    });
+                  }
+                })
+              }
+            },
             //删除
             delectList(){
               if(this.selectedRowKeys.length==0){
@@ -359,7 +399,8 @@
               return {
                 on: {
                   dblclick: () => {
-                    
+                    this.$refs.EncoderDetail.visible=true
+                    this.$refs.EncoderDetail.getEditData(this.selectedRowKeys[0])
                   },
                 } 
               }  

src/views/production/safetyStock/modules/AddEncoder.vue

@@ -22,6 +22,13 @@
                     <a-input-search placeholder="请输入" v-model="form.classifyName" @search="searchClassName"></a-input-search>
                   </a-form-model-item>
                 </a-col>
+                <a-col :md="8" :sm="24" >
+                  <a-form-model-item label="料品主单位" prop='unit' >
+                      <a-select style="width:100%;"  v-model="form.unit" @change="changeUnit">
+                          <a-select-option v-for="(val,index) in unitOptions" :key="index" :value="val.Name">{{ val.Name }}</a-select-option>
+                      </a-select>
+                  </a-form-model-item>
+                </a-col>
                 <a-col :md="8" :sm="24">
                     <a-form-model-item label="料品辅单位" prop='auxiliaryUnit' >
                       <a-select style="width:100%;"  v-model="form.auxiliaryUnit" @change="changeAuxiliaryUnit">
@@ -29,13 +36,7 @@
                         </a-select>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="8" :sm="24" >
-                    <a-form-model-item label="料品主单位" prop='unit' >
-                        <a-select style="width:100%;"  v-model="form.unit" @change="changeUnit">
-                            <a-select-option v-for="(val,index) in unitOptions" :key="index" :value="val.Name">{{ val.Name }}</a-select-option>
-                        </a-select>
-                    </a-form-model-item>
-                  </a-col>
+                  
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="颜色" prop='color' :labelCol="{offset: 1}">
                       <a-input v-model="form.color"/>
@@ -96,6 +97,12 @@
               fixedLength:[
                 { required: true, trigger: 'blur' },
               ],
+              auxiliaryUnit:[
+                { required: true, trigger: 'blur' },
+              ],
+              unit:[
+                { required: true, trigger: 'blur' },
+              ],
             }
           }
         },

src/views/production/safetyStock/modules/EncoderDetail.vue

@@ -24,16 +24,17 @@
                     <a-input placeholder="请输入" v-model="form.classifyName" disabled></a-input>
                   </a-form-model-item>
                 </a-col>
+                <a-col :md="8" :sm="24" >
+                  <a-form-model-item label="料品主单位" prop='unit' >
+                    <a-input placeholder="请输入" v-model="form.unit" disabled></a-input>
+                  </a-form-model-item>
+                </a-col>
                 <a-col :md="8" :sm="24">
                     <a-form-model-item label="料品辅单位" prop='auxiliaryUnit' >
                       <a-input placeholder="请输入" v-model="form.auxiliaryUnit" disabled></a-input>
                     </a-form-model-item>
                   </a-col>
-                  <a-col :md="8" :sm="24" >
-                    <a-form-model-item label="料品主单位" prop='unit' >
-                      <a-input placeholder="请输入" v-model="form.unit" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col>
+                 
                   <a-col :md="8" :sm="24">
                     <a-form-model-item label="颜色" prop='color' :labelCol="{offset: 1}">
                       <a-input v-model="form.color" disabled/>
@@ -89,6 +90,12 @@
               fixedLength:[
                 { required: true, trigger: 'blur' },
               ],
+              auxiliaryUnit:[
+                { required: true, trigger: 'blur' },
+              ],
+              unit:[
+                { required: true, trigger: 'blur' },
+              ],
             }
           }
         },

src/views/production/safetyStock/modules/safetyStockListAdd.vue

@@ -18,27 +18,29 @@
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
-                  <a-form-model-item label="组织编码"  prop='orgCode' >
+                  <a-form-model-item label="组织编码"  prop='orgCode' :labelCol="{offset: 1}">
                     <a-input placeholder="请输入" v-model="form.orgCode" disabled></a-input>
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
-                    <a-form-model-item label="型号" name='model' :labelCol="{offset: 1}">
-                      <a-input placeholder="请输入" v-model="form.model" disabled></a-input>
-                    </a-form-model-item>
-                  </a-col>
                 <a-col :md="8" :sm="24">
                   <a-form-model-item label="料品编码"  prop='inventoryCode' >
                     <a-input-search placeholder="请输入" v-model="form.inventoryCode" @search="onSearchInvebtory" readOnly></a-input-search>
                   </a-form-model-item>
                 </a-col>
                 <a-col  :md="8" :sm="24">
-                  <a-form-model-item label="料品名称" name='inventoryName' >
+                  <a-form-model-item label="料品名称" name='inventoryName'  :labelCol="{offset: 1}">
                     <a-input placeholder="请输入" v-model="form.inventoryName" disabled ></a-input>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
-                    <a-form-model-item label="规格" name='model' :labelCol="{offset: 1}">
+                    <a-form-model-item label="型号" name='model' :labelCol="{offset: 3}">
+                      <a-input placeholder="请输入" v-model="form.model" disabled></a-input>
+                    </a-form-model-item>
+                  </a-col>
+               
+                
+                <a-col :md="8" :sm="24">
+                    <a-form-model-item label="料品规格" name='model' :labelCol="{offset: 1}">
                       <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
                     </a-form-model-item>
                   </a-col>
@@ -50,7 +52,7 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item label="安全库存" name='safetyStock' >
+                    <a-form-model-item label="安全库存" name='safetyStock'  :labelCol="{offset: 1}">
                       <a-input-number  :default-value="0"  v-model="form.safetyStock"/>
                     </a-form-model-item>
                   </a-col>

src/views/production/safetyStock/modules/safetyStockListDetail.vue

@@ -15,8 +15,8 @@
             <a-form layout="inline" @keyup.enter.native="searchQuery">
               <a-row :gutter="24">
                 <a-col :md="8" :sm="24">
-                  <a-form-model-item label="组织"  prop='pkOrg' :labelCol="{offset: 2}">
-                    <a-input-search placeholder="请输入" v-model="form.pkOrg" disabled></a-input-search>
+                  <a-form-model-item label="组织信息"  prop='pkOrg'>
+                    <a-input-search placeholder="请输入" v-model="form.orgName" disabled></a-input-search>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
@@ -24,11 +24,7 @@
                     <a-input placeholder="请输入" v-model="form.orgCode" disabled></a-input>
                   </a-form-model-item>
                 </a-col>
-                <a-col :md="8" :sm="24">
-                    <a-form-item label="型号" prop='model'>
-                      <a-input-search placeholder="请输入" v-model="form.model" disabled></a-input-search>
-                    </a-form-item>
-                  </a-col>
+               
                 <a-col :md="8" :sm="24">
                   <a-form-item label="料品编码" prop='inventoryCode'>
                     <a-input-search placeholder="请输入" v-model="form.inventoryCode" disabled></a-input-search>
@@ -40,7 +36,12 @@
                   </a-form-item>
                 </a-col>
                 <a-col :md="8" :sm="24">
-                    <a-form-item label="规格" prop='model'>
+                    <a-form-item label="料品型号" prop='model'>
+                      <a-input-search placeholder="请输入" v-model="form.model" disabled></a-input-search>
+                    </a-form-item>
+                  </a-col>
+                <a-col :md="8" :sm="24">
+                    <a-form-item label="料品规格" prop='model'>
                       <a-input placeholder="请输入" v-model="form.specs" disabled></a-input>
                     </a-form-item>
                   </a-col>

src/views/production/safetyStock/safetyStockList.vue

@@ -6,6 +6,11 @@
           <div class="table-page-search-wrapper">
             <a-form layout="inline" @keyup.enter.native="searchQuery">
               <a-row :gutter="24">
+                <a-col :md="4" :sm="24">
+                  <a-form-item label="组织">
+                    <a-input placeholder="请输入" v-model="queryParam.orgName" ></a-input>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="4" :sm="24">
                   <a-form-item label="料品编码">
                     <a-input placeholder="请输入" v-model="queryParam.inventoryCode" ></a-input>
@@ -21,17 +26,18 @@
                         <a-input placeholder="请输入" v-model="queryParam.attribute" ></a-input>
                     </a-form-item>
                   </a-col>
+                  <template v-if="toggleSearchStatus"> 
                   <a-col :md="4" :sm="24">
                     <a-form-item label="规格">
                       <a-input placeholder="请输入" v-model="queryParam.specs"></a-input>
                     </a-form-item>
                   </a-col>
-                <template v-if="toggleSearchStatus"> 
-                  <a-col :md="4" :sm="24">
+                
+               <!--   <a-col :md="4" :sm="24">
                     <a-form-item label="型号">
                       <a-input placeholder="请输入" v-model="queryParam.model" ></a-input>
                     </a-form-item>
-                  </a-col>
+                  </a-col> -->
                   <a-col :md="4" :sm="24">
                     <a-form-item label="安全库存">
                       <a-input placeholder="请输入" v-model="queryParam.safetyStock"></a-input>
@@ -77,12 +83,12 @@
               :columns="columns"
               :dataSource="dataSource"
               :pagination="ipagination"
-              :scroll="{ x: 1500, y: 300 }"
+              
               :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
               @change="handleTableChange"
               :customRow ="clickRow"
               >
-      
+      <!-- :scroll="{ x: 1500, y: 300 }" -->
             </a-table>
           </div>
           <!-- table区域-end -->
@@ -141,13 +147,21 @@
                     return parseInt(index)+1;
                   }
                 },
+                {
+                  title: '组织',
+                  align:"center",
+                  dataIndex: 'orgName',
+                  ellipsis: true,
+                    
+                },
                 {
                   title: '料品编码',
                   align:"center",
                   dataIndex: 'inventoryCode',
                   ellipsis: true,
     
-                },
+                }, 
+                
                 {
                   title: '料品名称',
                   align:"center",
@@ -169,13 +183,13 @@
                   ellipsis: true,
     
                 },
-                {
-                  title: '型号',
-                  align:"center",
-                  dataIndex: 'model',
-                  ellipsis: true,
+    //             {
+    //               title: '型号',
+    //               align:"center",
+    //               dataIndex: 'model',
+    //               ellipsis: true,
     
-                },
+    //             },
                 {
                   title: '安全库存',
                   align:"center",