产品管理

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProductServiceImpl.java

@@ -23,6 +23,7 @@ import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;

fhKeeper/formulahousekeeper/timesheet-workshop-h5/package-lock.json

@@ -3737,8 +3737,7 @@
       "version": "4.6.0",
       "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "coa": {
       "version": "2.0.2",
@@ -10416,8 +10415,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true,
-      "optional": true
+      "dev": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",

fhKeeper/formulahousekeeper/timesheet-workshop-h5/vue.config.js

@@ -6,9 +6,10 @@ const Timestamp = new Date().getTime();
 
 // var ip = '47.101.180.183'
 // var ip = '47.100.37.243'
-var ip = '192.168.2.12'
+//var ip = '192.168.2.12'
 // var ip = '192.168.2.12'
-// var ip = '127.0.0.1'
+ var ip = '127.0.0.1'
+
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {

fhKeeper/formulahousekeeper/timesheet-workshop/src/views/product/list.vue

@@ -18,19 +18,11 @@
                 </el-form-item>
                 <!--操作按钮-->
                 <el-form-item style="float:right;">
-<<<<<<< HEAD
                     <el-link type="primary" :underline="false"  :disabled="productSelections.length==0" @click="importProduct()">导出产品</el-link>
                 </el-form-item>
                 <el-form-item style="float:right;">
                     <el-upload class="filter-item" name="file" action :on-error="uploadFalse" :on-success="uploadSuccess"
                         :before-upload="beforeAvatarUpload"  ref="upload" accept=".xlsx,.xls"
-=======
-                    <el-link type="primary" :underline="false" @click="importProduct()">导出产品</el-link>
-                </el-form-item>
-                <el-form-item style="float:right;">
-                    <el-upload class="filter-item" name="file" action :on-error="uploadFalse" :on-success="uploadSuccess"
-                        :before-upload="beforeAvatarUpload" :limit="1" ref="upload" accept=".xlsx,.xls"
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                         :show-file-list="false" :file-list="fileList" :http-request="uploadFile">
 
                         <el-link type="primary" :underline="false">导入产品</el-link>
@@ -118,11 +110,7 @@
 
             <el-table-column type="selection" width="55">
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column prop="name" label="产品名称"  width="300"></el-table-column>
-=======
-            <el-table-column prop="name" label="产品名称" sortable="custom" width="300"></el-table-column>
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
             <el-table-column prop="code" label="项目代码" width="200"></el-table-column>
             <el-table-column prop="orderNumber" label="订单数量" width="100"></el-table-column>
             <el-table-column prop="unit" label="单位" width="100"></el-table-column>
@@ -198,16 +186,11 @@
                         <el-input v-model="addForm.name" :placeholder="$t('peaseenterthe')" clearable maxlength="50"
                             show-word-limit="true"></el-input>
                     </el-form-item>
-<<<<<<< HEAD
                     <el-form-item label="项目代码" prop="code">
-=======
-                    <el-form-item label="项目代码">
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                         <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
                         <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable maxlength="50"
                             show-word-limit="true"></el-input>
                     </el-form-item>
-<<<<<<< HEAD
                     <el-form-item label="订单数量" prop="orderNumber">
                         <el-input-number v-model="addForm.orderNumber" :placeholder="$t('peaseenterthe')" clearable
                             :min="1" :max="10000"></el-input-number>
@@ -217,35 +200,16 @@
                             maxlength="10"></el-input>
                     </el-form-item>
                     <el-form-item label="编组" prop="groupNumber">
-=======
-                    <el-form-item label="订单数量">
-                        <el-input-number v-model="addForm.orderNumber" :placeholder="$t('peaseenterthe')" clearable
-                            :min="1"></el-input-number>
-                    </el-form-item>
-                    <el-form-item label="单位">
-                        <el-input v-model="addForm.unit" :placeholder="$t('peaseenterthe')" clearable
-                            maxlength="10"></el-input>
-                    </el-form-item>
-                    <el-form-item label="编组">
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                         <el-input v-model="addForm.groupNumber" :placeholder="$t('peaseenterthe')" clearable
                             maxlength="10"></el-input>
                     </el-form-item>
                     <el-form-item label="每列数量">
                         <el-input-number v-model="addForm.columnNumber" :placeholder="$t('peaseenterthe')"
-<<<<<<< HEAD
                             :min="1" :max="10000"></el-input-number>
                     </el-form-item>
                     <el-form-item label="每辆数量">
                         <el-input-number v-model="addForm.vehicleNumber" :placeholder="$t('peaseenterthe')"
                             :min="1" :max="10000"></el-input-number>
-=======
-                            :min="1"></el-input-number>
-                    </el-form-item>
-                    <el-form-item label="每辆数量">
-                        <el-input-number v-model="addForm.vehicleNumber" :placeholder="$t('peaseenterthe')"
-                            :min="1"></el-input-number>
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                     </el-form-item>
 
                     <el-form-item label="描述" prop="description">
@@ -437,23 +401,6 @@
                 <el-button type="primary" @click=" saveCopyProduct()">确定</el-button>
             </span>
         </el-dialog>
-<<<<<<< HEAD
-=======
-        <!-- 复制产品 -->
-        <el-dialog :title="title" :visible.sync="copyVisible" width="30%">
-            <div>
-                <el-form ref="form" :model="category" label-width="80px">
-                    <el-form-item label="产品名称">
-                        <el-input v-model="pdName"></el-input>
-                    </el-form-item>
-                </el-form>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="copyVisible = false">取 消</el-button>
-                <el-button type="primary" @click=" saveCopyProduct()">确定</el-button>
-            </span>
-        </el-dialog>
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
 
         <!-- 新增产品分类 -->
         <el-dialog :title="title" :visible.sync="isganttshowCa" width="30%">
@@ -689,20 +636,14 @@ a {
 import util from "../../common/js/util";
 // 自定义select组件
 import selectCat from "@/components/select.vue"
-<<<<<<< HEAD
 import { version } from 'vue';
-=======
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
 export default {
     components: {
         selectCat
     },
     data() {
         return {
-<<<<<<< HEAD
             
-=======
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
             copyVisible: false,
             pdName: '',
             productSelections: [], //选中的产品id集合
@@ -847,7 +788,6 @@ export default {
             rules: {
                 name: [{ required: true, message: this.$t('pleaseentername'), trigger: "blur" }],
                 code: [{ required: true, message: this.$t('qing-shu-ru-bian-hao'), trigger: "blur" }],
-<<<<<<< HEAD
                 orderNumber: [{ required: true, message:' 请输入订单数量', trigger: "blur" }],
                 unit: [{ required: true, message: '请输入单位', trigger: "blur" }],
                 groupNumber: [{ required: true, message: '请输入编组', trigger: "blur" }],
@@ -939,94 +879,6 @@ export default {
 
             createDate: [], // 项目筛选时间段
 
-=======
-                projectStageName: [{ required: true, message: this.$t('pleaseentername'), trigger: "blur" }],
-                projectLevelName: [{ required: true, message: this.$t('pleaseentername'), trigger: "blur" }],
-            },
-            ause: [],
-            auseList: [],
-            yonghuUser: [],
-            filterText: '',
-            filterText2: '',
-            showClfDialog: false,
-            addClfDialog: false,
-            addClf: { name: '', id: '' },
-            addMainForm: {
-                name: '',
-                id: '',
-                code: '',
-                categoryId: ''
-            },
-            addPanthForm: {
-                id: '',
-                projectStageName: ''
-            },
-            addLevelForm: {
-                id: '',
-                projectStageName: ''
-            },
-            statusClf: null,
-            permissionsObj: {},
-            checkedPForSubArr: [],
-            checkedProjectArr: [],
-            checkedWuduDialog: false,
-            checkedWuduArr: [],
-            checkoradd: true,
-
-            addGroupPersonBtnLoading: false,
-            addGroupPersonDialog: false,
-            addGroupList: [],
-            addGroupPersonData: {
-                group: [],
-                person: null,
-                personNames: ''
-            },
-            addGroupPersonPdialog: false,
-            showColumnWidth: '300',
-            deleteVif: null,
-            isAddGroupPerson: true,
-            projectMainId: '',
-            supplierList: '',
-            sortProp: '',
-            sortOrder: null,
-            currentCell: null, // 当前单击的是哪一个单元格
-            phaseList: [],
-            phaseProjectId: '', // 阶段项目id
-            phaseProjectValie: null, // 阶段项目值
-            listHeader: [], // 列表表头
-            rowid: '',
-            phaseProjectDialog: false, // 项目阶段
-            levelList: [],  // 项目级别
-            departmentList: [],
-            deptId: [],
-            buOption: [],
-            contractAmountOld: 0,
-            contractAmountReasonShow: false,
-            centerNameDegree: '',
-
-            batchInchargerDialog: false,
-            paramInchargerId: '',
-
-            inchagerId: '',
-
-            keyNodesIsShow: false,
-            keyNodesList: [],
-            projectKeyNodesData: [],
-            addBasekeyNodesialog: false,
-            addFormkeyNodes: {
-                name: ''
-            },
-            participationId: '',
-
-            importProjectBeforeDialog: false,
-            paramData1: false,
-            chosenListBackup: [], // 备份
-            searchPersonnelFlg: false,
-            searchPersonnelFlgnum: 1,
-
-            createDate: [], // 项目筛选时间段
-
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
             exportDisabled: false,
             exportNotification: null,
             dataList: [],
@@ -1082,15 +934,9 @@ export default {
             this.$refs.productTbl.doLayout();
         })
     },
-<<<<<<< HEAD
 
     methods: {
         uploadFile(params) {
-=======
-    methods: {
-        uploadFile(params) {
-
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
             let str = params.file.name.split(".");
             let format1 = str[str.length - 1];
             if (format1 != "xls" && format1 != "xlsx") {
@@ -1198,11 +1044,7 @@ export default {
 
         getCategoryList() {
             this.isganttshow = true
-<<<<<<< HEAD
            
-=======
-            console.log("======")
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
             console.log(this.categoryList)
             this.http.post("/prod-category/getList", null,
                 res => {
@@ -1296,7 +1138,6 @@ export default {
 
         },
         submitSequence(addSequence) {
-<<<<<<< HEAD
             let flag=true
             
 
@@ -1342,34 +1183,6 @@ export default {
                             } else {
                                 this.addFormVisible = false;
                             }
-=======
-            this.addLoading = true;
-            let procedureString = JSON.stringify(this.procedureLit);
-            this.http.post('/prod-procedure/changeProdProcedure', {
-                productId: this.productId,
-                version: this.procedureVersion,
-                prodProcedures: procedureString,
-                productName: this.productName
-            },
-                res => {
-                    this.addLoading = false;
-                    if (res.code == "ok") {
-                        this.$message({
-                            message: (this.addForm.id != null ? this.$t('xiu-gai') : this.$t('create')) + this.$t('other.successful'),
-                            type: "success"
-                        });
-                        if (addSequence) {
-                            //进入物料录入
-
-                            this.http.post('/prod-material/getProdMaterialList', { productId: this.productId },
-                                res => {
-                                    this.prodMaterialList = res.data.prodMaterialList;
-                                    this.prodMaterialVersion = res.data.version;
-                                })
-                            this.prodEditActive = 2;
-
-
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                         } else {
                             this.$message({
                                 message: res.msg,
@@ -1389,14 +1202,10 @@ export default {
                     message: "版本号或工序中部分数据为空",
                     type: "error"
                 });
-<<<<<<< HEAD
             }
 
            
 
-=======
-
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
         },
 
         //删除工序
@@ -1424,10 +1233,7 @@ export default {
                 name: '',
                 unitPrice: '',
                 workingTime: '',
-<<<<<<< HEAD
                 checkType: 0
-=======
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
 
             }]
         },
@@ -3204,11 +3010,7 @@ export default {
         //复制产品
         copyProduct(item) {
             this.copyVisible = true
-<<<<<<< HEAD
             this.pdName = item.name
-=======
-            this.pdName = ''
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
             this.productId = item.id
 
         },
@@ -3391,15 +3193,11 @@ export default {
         },
         submitInsert(addSequence) {
             this.$refs.form1.validate(valid => {
-<<<<<<< HEAD
                 console.log(valid)
                 if (valid) {
 
                     if(Number.isInteger(this.addForm.orderNumber)&& Number.isInteger(this.addForm.columnNumber) && Number.isInteger(this.addForm.vehicleNumber)){    
                     //console.log("valid",valid)
-=======
-                if (valid) {
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                     this.addLoading = true;
                     this.addForm.categoryId = this.cateId;
                     this.http.post('/product/saveProductInfo', this.addForm,
@@ -3440,7 +3238,6 @@ export default {
                                 type: "error"
                             });
                         });;
-<<<<<<< HEAD
                     } else {
                          this.$message({
                             message: "数量要为整数",
@@ -3448,8 +3245,6 @@ export default {
                         });
                     }
 
-=======
->>>>>>> fc473965b2e11496bab2d6f4b9626eabdc7ea16b
                 }
             });
         },