Merge branch 'master' of http://192.168.1.149:10010/r/高精2.0

src/api/PurchasingCenter/ReceiveCheck.js

@@ -12,15 +12,14 @@ export function initProject() {
   })
 }
 // 初始化项目金额统计表
-export function searchReceiveCheck(pageCurrent, pageSize, check, num) {
+export function searchReceiveCheck(check, num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_领用核算_查询数据',
-      param: `项目流水号_check=${check}&项目流水号=${num}`,
+      param: `项目流水号_check=${check}&项目流水号=${num}`
-      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }

src/views/BasicData/PersonnelManagement/index.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="6">
         <el-card>
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
+          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd('department_Form')">新增</el-button>
           <el-button type="warning" icon="el-icon-edit" size="small" @click="handleEdit()">编辑</el-button>
           <el-button type="danger" icon="el-icon-delete" size="small" @click="deleteTable()">删除</el-button>
         </el-card>
@@ -187,8 +187,8 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-if="department_Title==='新增部门'" type="primary" @click="submitAdd">确定</el-button>
+        <el-button v-if="department_Title==='新增部门'" type="primary" @click="submitAdd('department_Form')">确定</el-button>
-        <el-button v-else-if="department_Title==='编辑部门'" type="primary" @click="submitEdit">确定</el-button>
+        <el-button v-else-if="department_Title==='编辑部门'" type="primary" @click="submitEdit('department_Form')">确定</el-button>
       </div>
     </el-dialog>
 
@@ -353,7 +353,8 @@ export default {
         Title: [{ required: true, message: '请输入', trigger: 'change' }],
         PositionStatus: [{ required: true, message: '请输入', trigger: 'change' }],
         Education: [{ required: true, message: '请输入', trigger: 'change' }],
-        Post: [{ required: true, message: '请输入', trigger: 'change' }]
+        Post: [{ required: true, message: '请输入', trigger: 'change' }],
+        DepartmentName: [{ required: true, message: '请输入', trigger: 'blur' }]
       },
       SexData: [{
         value: 1,
@@ -365,7 +366,9 @@ export default {
       EducationDate: [],
       PostData: [],
       multipleSelection: [],
-      nodeName1: []
+      nodeName1: [],
+      count1: 0,
+      count2: 0
     }
   },
   created() {
@@ -418,10 +421,14 @@ export default {
         }
       }
     },
-    handleAdd() {
+    handleAdd(formName) {
       this.department_Title = '新增部门'
       this.department_DFV = true
-      this.addForm('department_Form')
+      this.department_Form.DepartmentName = ''
+      this.count1 = this.count1 + 1
+      if (this.count1 !== 1) {
+        this.$refs[formName].resetFields()
+      }
     },
     handleEdit() {
       this.addForm('department_Form')
@@ -433,44 +440,75 @@ export default {
         this.$message.warning(`请选择要修改的部门`)
       }
     },
-    submitAdd() {
+    submitAdd(formName) {
-      this.department_DFV = false
+      this.$refs[formName].validate((valid) => {
-      if (this.id) {
+        if (valid) {
-        addDepartmentName(this.id, this.department_Form.DepartmentName, 0).then(response => {
+          this.department_DFV = false
-          console.log(response.data[0].result === '1')
+          if (this.id) {
-          if (response.data[0].result === '1') {
+            addDepartmentName(this.id, this.department_Form.DepartmentName, 0).then(response => {
-            this.getTreeData()
+              if (response.data[0].result === '1') {
-            this.$message.success('添加成功')
+                this.getTreeData()
+                this.$message.success('添加成功')
+              } else {
+                this.$message.error('添加失败')
+              }
+            })
           } else {
-            this.$message.error('添加失败')
+            addDepartmentName(0, this.department_Form.DepartmentName, 0).then(response => {
+              if (response.data[0].result === '1') {
+                this.getTreeData()
+                this.$message.success('添加成功')
+              } else {
+                this.$message.error('添加失败')
+              }
+            })
           }
-        })
-      } else {
-        addDepartmentName(0, this.department_Form.DepartmentName, 0).then(response => {
-          if (response.data[0].result === '1') {
-            this.getTreeData()
-            this.$message.success('添加成功')
-          } else {
-            this.$message.error('添加失败')
-          }
-        })
-      }
-    },
-    submitEdit() {
-      this.department_DFV = false
-      editList(this.id, this.department_Form.DepartmentName).then(response => {
-        if (response.data[0].result === '1') {
-          this.getTreeData()
-          this.$message.success('编辑成功')
         } else {
-          this.$message.error('编辑失败')
+          return false
+        }
+      })
+    },
+    submitEdit(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.department_DFV = false
+          editList(this.id, this.department_Form.DepartmentName).then(response => {
+            if (response.data[0].result === '1') {
+              this.getTreeData()
+              this.$message.success('编辑成功')
+            } else {
+              this.$message.error('编辑失败')
+            }
+          })
+        } else {
+          return false
         }
       })
     },
     deleteTable() {
       if (this.id) {
-        this.deleteRow(delList, this.id, function() { this.getTreeData() })
+        this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        this.i = 1
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delList(this.id).then(response => {
+            if (response.data[0].result === '1') {
+              this.getTreeData()
+              this.i = 1
+              this.id = ''
+              this.$message({
+                message: '已被成功删除',
+                type: 'success'
+              })
+            }
+          })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
+        })
       } else {
         this.$message.warning(`请选择部门`)
       }
@@ -508,6 +546,7 @@ export default {
       if (this.id) {
         addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
           if (response.data[0].result === '1') {
+            this.i = 1
             this.handleNodeClick()
             this.$message.success('添加成功')
           } else {

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -167,16 +167,16 @@
           <!--</el-input>-->
           <!--</template>-->
           <!--</el-table-column>-->
-          <el-table-column label="操作" width="300px" fixed="right" align="center">
+          <el-table-column label="操作" width="200px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
                 size="mini"
                 type="primary"
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
-              <el-button
+                <!--<el-button-->
-                size="mini"
+                <!--size="mini"-->
-                type="primary"
+                <!--type="primary"-->
-                @click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>
+                <!--@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>-->
             </template>
           </el-table-column>
         </el-table>

src/views/Outsourcing/OutsourcingTaskExecution/index.vue

@@ -53,8 +53,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="200px">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="scope.row.单据状态==='成交'" type="primary" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button :disabled="scope.row.单据状态==='成交'" type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/PurchasingCenter/OfflineContractRequestFund/index.vue

@@ -95,7 +95,7 @@
               </el-table>
               <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button :disabled="parseInt(scope.row.审核情况流水号)!==3&&parseInt(scope.row.审批情况流水号)!==3&&parseInt(scope.row.付款情况流水号)!==3" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
+            <el-button :disabled="parseInt(scope.row.审核情况流水号)===1" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/PurchasingCenter/ProjectTotalSearch/index.vue

@@ -18,7 +18,8 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="" :data="tableData1" show-summary border style="width: 100%;max-height: 500px;" height="500px" size="mini">
+      <el-table v-loading="" :data="tableData1" show-summary stripe border style="width: 100%;max-height: 500px;" height="500px" size="mini">
+        <el-table-column label="序号" align="center" width="80" type="index"/>
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -29,16 +30,16 @@
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
         <el-table-column label="物料型号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
+        <el-table-column label="物料规格" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 }}
+          </template>
+        </el-table-column>
         <el-table-column label="数量" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.数量 }}

src/views/PurchasingCenter/PurchaseContractApproval/index.vue

@@ -99,60 +99,58 @@
       </div>
     </el-card>
 
-    <el-card>
+    <div style="width:900px;margin: 0 auto">
-      <div style="width:900px;margin-left: 350px">
+      <el-card>
-        <el-card>
+        <table id="1" cellspacing="0px" align="center" border width="100%" style="">
-          <table id="1" cellspacing="0px" align="center" border width="100%" style="">
+          <tr style="height: 40px">
+            <td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
+            <td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
+          </tr>
+          <tr style="height: 40px">
+            <td colspan="1" align="center">需方</td>
+            <td colspan="1" align="center">江苏高精机电装备有限公司</td>
+            <td colspan="1" align="center">合同编号</td>
+            <td colspan="1" align="center">{{ contract }}</td>
+          </tr>
+          <tr style="height: 40px">
+            <td colspan="1" align="center">供方</td>
+            <td colspan="1" align="center">{{ supplier }}</td>
+            <td colspan="1" align="center">签订地点</td>
+            <td colspan="1" align="center">江苏盐城</td>
+          </tr>
+        </table>
+        <div>一、 产品名称、型号、数量、单价、品牌：</div>
+        <table id="2" cellspacing="0px" align="center" border width="100%" style="">
+          <tbody id="4">
+            <tr id="tableHead" style="height: 40px">
+              <td colspan="1" align="center">物料名称</td>
+              <td colspan="1" align="center">物料规格</td>
+              <td colspan="1" align="center">物料型号</td>
+              <td colspan="1" align="center">发货天数</td>
+              <td colspan="1" align="center">数量</td>
+              <td colspan="1" align="center">单价</td>
+              <td colspan="1" align="center">总价</td>
+            </tr>
+          </tbody>
+          <tfoot>
             <tr style="height: 40px">
-              <td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
+              <td colspan="6">运费：</td>
-              <td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
+              <td colspan="1" align="center">{{ freight }}</td>
             </tr>
             <tr style="height: 40px">
-              <td colspan="1" align="center">需方</td>
+              <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
-              <td colspan="1" align="center">江苏高精机电装备有限公司</td>
+              <td colspan="1" align="center">{{ TotalAmount }}</td>
-              <td colspan="1" align="center">合同编号</td>
-              <td colspan="1" align="center">{{ contract }}</td>
             </tr>
-            <tr style="height: 40px">
+          </tfoot>
-              <td colspan="1" align="center">供方</td>
+        </table>
-              <td colspan="1" align="center">{{ supplier }}</td>
+        <div id="23"/>
-              <td colspan="1" align="center">签订地点</td>
+      </el-card>
-              <td colspan="1" align="center">江苏盐城</td>
+    </div>
-            </tr>
-          </table>
-          <div>一、 产品名称、型号、数量、单价、品牌：</div>
-          <table id="2" cellspacing="0px" align="center" border width="100%" style="">
-            <tbody id="4">
-              <tr id="tableHead" style="height: 40px">
-                <td colspan="1" align="center">物料名称</td>
-                <td colspan="1" align="center">物料规格</td>
-                <td colspan="1" align="center">物料型号</td>
-                <td colspan="1" align="center">发货天数</td>
-                <td colspan="1" align="center">数量</td>
-                <td colspan="1" align="center">单价</td>
-                <td colspan="1" align="center">总价</td>
-              </tr>
-            </tbody>
-            <tfoot>
-              <tr style="height: 40px">
-                <td colspan="6">运费：</td>
-                <td colspan="1" align="center">{{ freight }}</td>
-              </tr>
-              <tr style="height: 40px">
-                <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
-                <td colspan="1" align="center">{{ TotalAmount }}</td>
-              </tr>
-            </tfoot>
-          </table>
-          <div id="23"/>
-        </el-card>
-      </div>
-    </el-card>
 
-    <el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="20%">
+    <el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="370px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="审批是否通过" prop="审批是否通过" center>
-          <el-select v-model="form2.审批是否通过" size="small" @change="selectChange">
+          <el-select v-model="form2.审批是否通过" size="small">
             <el-option
               v-for="item in approval"
               :key="item.value"
@@ -161,7 +159,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="未通过原因" prop="未通过原因">
-          <el-input v-model="form2.未通过原因" :disabled="disabled" size="small"/>
+          <el-input v-model="form2.未通过原因" :disabled="form2.审批是否通过!==2" size="small"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -213,7 +211,6 @@ export default {
           label: '否'
         }
       ],
-      disabled: true,
       form2: {
         审批是否通过: 1,
         未通过原因: ''
@@ -277,11 +274,6 @@ export default {
       this.dialogVisible3 = true
       this.ProcurementContractNum = row.采购合同流水号
     },
-    selectChange() {
-      if (this.form2.审批是否通过 === 2) {
-        this.disabled = false
-      }
-    },
     submitApproval(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -120,59 +120,57 @@
       </div>
     </el-card>
 
-    <el-card>
+    <div style="margin:5px;float: left">
-      <div style="float: left">
+      <b>二维码：</b><br>
-        <b>二维码：</b><br>
+      <img id="img">
-        <img id="img">
+    </div>
-      </div>
+    <div style="width:900px;margin: 0 auto">
-      <div style="width:900px;margin-left: 350px">
+      <el-card>
-        <el-card>
+        <table id="1" cellspacing="0px" align="center" border width="100%" style="">
-          <table id="1" cellspacing="0px" align="center" border width="100%" style="">
+          <tr style="height: 40px">
+            <td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
+            <td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
+          </tr>
+          <tr style="height: 40px">
+            <td colspan="1" align="center">需方</td>
+            <td colspan="1" align="center">江苏高精机电装备有限公司</td>
+            <td colspan="1" align="center">合同编号</td>
+            <td colspan="1" align="center">{{ contract }}</td>
+          </tr>
+          <tr style="height: 40px">
+            <td colspan="1" align="center">供方</td>
+            <td colspan="1" align="center">{{ supplier }}</td>
+            <td colspan="1" align="center">签订地点</td>
+            <td colspan="1" align="center">江苏盐城</td>
+          </tr>
+        </table>
+        <div>一、 产品名称、型号、数量、单价、品牌：</div>
+        <table id="2" cellspacing="0px" align="center" border width="100%" style="">
+          <tbody id="4">
+            <tr id="tableHead" style="height: 40px">
+              <td colspan="1" align="center">物料名称</td>
+              <td colspan="1" align="center">物料规格</td>
+              <td colspan="1" align="center">物料型号</td>
+              <td colspan="1" align="center">发货天数</td>
+              <td colspan="1" align="center">数量</td>
+              <td colspan="1" align="center">单价</td>
+              <td colspan="1" align="center">总价</td>
+            </tr>
+          </tbody>
+          <tfoot>
             <tr style="height: 40px">
-              <td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
+              <td colspan="6">运费：</td>
-              <td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
+              <td colspan="1" align="center">{{ freight }}</td>
             </tr>
             <tr style="height: 40px">
-              <td colspan="1" align="center">需方</td>
+              <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
-              <td colspan="1" align="center">江苏高精机电装备有限公司</td>
+              <td colspan="1" align="center">{{ TotalAmount }}</td>
-              <td colspan="1" align="center">合同编号</td>
-              <td colspan="1" align="center">{{ contract }}</td>
             </tr>
-            <tr style="height: 40px">
+          </tfoot>
-              <td colspan="1" align="center">供方</td>
+        </table>
-              <td colspan="1" align="center">{{ supplier }}</td>
+        <div id="23"/>
-              <td colspan="1" align="center">签订地点</td>
+      </el-card>
-              <td colspan="1" align="center">江苏盐城</td>
+    </div>
-            </tr>
-          </table>
-          <div>一、 产品名称、型号、数量、单价、品牌：</div>
-          <table id="2" cellspacing="0px" align="center" border width="100%" style="">
-            <tbody id="4">
-              <tr id="tableHead" style="height: 40px">
-                <td colspan="1" align="center">物料名称</td>
-                <td colspan="1" align="center">物料规格</td>
-                <td colspan="1" align="center">物料型号</td>
-                <td colspan="1" align="center">发货天数</td>
-                <td colspan="1" align="center">数量</td>
-                <td colspan="1" align="center">单价</td>
-                <td colspan="1" align="center">总价</td>
-              </tr>
-            </tbody>
-            <tfoot>
-              <tr style="height: 40px">
-                <td colspan="6">运费：</td>
-                <td colspan="1" align="center">{{ freight }}</td>
-              </tr>
-              <tr style="height: 40px">
-                <td colspan="6">总价:  (人民币){{ RMB }}(含0.17增值税) </td>
-                <td colspan="1" align="center">{{ TotalAmount }}</td>
-              </tr>
-            </tfoot>
-          </table>
-          <div id="23"/>
-        </el-card>
-      </div>
-    </el-card>
 
     <el-card v-show="searchView">
       <!--将新一般处理页添加至通讯服务器-->
@@ -248,7 +246,8 @@ export default {
           quality: 0.3
         }
       }
-      const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum
+      // const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum
+      const str = 'http://192.168.1.111:8080/#/ContractInquiry/index?id=' + contractNum
       QRCode.toDataURL(str, opts, function(err, url) {
         if (err) throw err
         const img = document.getElementById('img')

src/views/PurchasingCenter/ReceiveCheck/index.vue

@@ -19,8 +19,9 @@
         height="440"
         size="mini"
         show-summary
-        highlight-current-row
+        stripe
         border>
+        <el-table-column align="center" label="序号" type="index"/>
         <el-table-column align="center" label="项目名称">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -62,16 +63,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
     </el-card>
   </div>
 </template>
@@ -111,20 +102,10 @@ export default {
       if (!this.projectValue) {
         this.$message.error('请选择项目')
       } else {
-        searchReceiveCheck(this.pageCurrent, this.pageSize, 1, this.projectValue).then(response => {
+        searchReceiveCheck(1, this.projectValue).then(response => {
-          this.tableData1 = response.data.rows
+          this.tableData1 = response.data
-          this.total = response.data.total
         })
       }
-    },
-    handleSizeChange(val) {
-      this.pageSize = val
-      this.pageCurrent = 1
-      this.searchProject()
-    },
-    handleCurrentChange(val) {
-      this.pageCurrent = val
-      this.searchProject()
     }
   }
 }