更新

src/api/WorkshopProcurement/ArrivalStateSearch.js

@@ -11,7 +11,7 @@ export function initArrivalStateContact() {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间管理_到货情况_查询数据_新1'
+      name: '车间管理_到货情况合同号_查询数据'
     }
   })
 }

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -154,11 +154,11 @@
       </el-tooltip>
       <hr>
       <!--html代码-->
-      <!--<div v-show="false">{{ content }}</div>-->
+      <div v-show="false">{{ content }}</div>
       <!--富文本编辑器-->
-      <!--<div v-show="!preview" id="tinymce" style="height:850px;">-->
+      <div v-show="false" id="tinymce" style="height:850px;">
-      <!--<tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>-->
+        <tinymce ref="tinymce" :height="700" v-model="contentNew" style="width:800px;margin: 0 auto;"/>
-      <!--</div>-->
+      </div>
       <!--网页预览-->
       <div v-show="!preview" class="editor-content" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="content"/>
     </el-card>
@@ -474,7 +474,7 @@ export default {
     },
     submitTotal() { // 确定合同总额
       // this.$refs.tinymce.destroyTinymce()
-      // this.$refs.tinymce.initTinymce()
+      this.$refs.tinymce.initTinymce()
       document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
       document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
       document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
@@ -832,11 +832,11 @@ export default {
           document.getElementsByClassName('actualTotal')[0].innerHTML = this.actualTotal
           document.getElementsByClassName('actualTotal')[1].innerHTML = this.actualTotal
           document.getElementById('actualTotal_zh').innerHTML = convertCurrency(this.actualTotal)
-          // this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
+          this.contentNew = document.getElementsByClassName('editor-content')[0].innerHTML
-          // this.$refs.tinymce.initTinymce()
+          this.$refs.tinymce.initTinymce()
           setTimeout(() => {
             this.submitTotal()
-            // this.$refs.tinymce.setContent(this.contentNew)
+            this.$refs.tinymce.setContent(this.contentNew)
           }, 1000)
         } else {
           this.$message.warning('请先选择合同模板，再预览')

src/views/PurchasingCenter/OfflineContract/index.vue

@@ -1460,16 +1460,17 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('离线合同生成成功')
               this.searchTable2()
-              searchMateriel(this.offlineContractNum).then(response => {
+              this.tableData3 = []
-                this.tableData3 = response.data
+              // searchMateriel(this.offlineContractNum).then(response => {
-                this.tableData3.map(v => {
+              //   this.tableData3 = response.data
-                  this.$set(v, '未税总额', 0)
+              //   this.tableData3.map(v => {
-                  this.$set(v, '含税总额', 0)
+              //     this.$set(v, '未税总额', 0)
-                  !v.单价 ? v.单价 = v.参考价格 : v.单价
+              //     this.$set(v, '含税总额', 0)
-                  this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
+              //     !v.单价 ? v.单价 = v.参考价格 : v.单价
-                })
+              //     this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
-                this.disable = true // 是否为编辑模式
+              //   })
-              })
+              //   this.disable = true // 是否为编辑模式
+              // })
             } else { this.$message.error('离线合同生成失败') }
           })
         }).catch(() => {

src/views/WorkshopProcurement/AccountingPrice/index.vue

@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column align="center" label="单价" width="100px">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.单价" size="mini" width="80px" align="center" readonly @change="update(scope.row)"/>
+            <el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @change="update(scope.row)"/>
           </template>
         </el-table-column>
         <el-table-column align="center" label="总额" width="70px">
@@ -132,6 +132,7 @@ export default {
           for (let i = 0; i < response.data.rows.length; i++) {
             this.tableData.push({
               采购合同编号: response.data.rows[i].采购合同编号,
+              采购合同明细流水号: response.data.rows[i].采购合同明细流水号,
               供应商名称: response.data.rows[i].供应商名称,
               物料型号: response.data.rows[i].物料型号,
               物料名称: response.data.rows[i].物料名称,
@@ -141,12 +142,12 @@ export default {
             })
           }
         }
-        console.log(this.tableData)
+        console.log(response, 90)
         this.total = response.data.total
       })
     },
     update(row) {
-      console.log(row)
+      console.log(row, 12)
       Preservation(row.采购合同明细流水号, row.单价).then(response => {
         console.log(response, 1111)
         if (response.data[0].result === '1') {

src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue

@@ -61,7 +61,7 @@
         </el-table-column>
         <el-table-column label="单价(元)" align="center" width="150">
           <template slot-scope="scope">
-            <el-input v-model="scope.row.单价" positive="'float'" class="editWorkTime" size="mini" style="width:100%" type="number" @input="filterNuber1(scope.row.单价, scope.$index, '单价')"/>
+            <el-input v-model="scope.row.单价" positive="'float'" class="editWorkTime" size="mini" style="width:100%" type="number" @blur="filterNuber1(scope.row.单价, scope.$index, '单价')"/>
             <!-- @change="update1(scope.row)"-->
           </template>
         </el-table-column>
@@ -499,6 +499,7 @@ export default {
       submitGroup(this.contractNumValue, this.form3.groupNumValue).then(response => {
         if (response.data[0].result === '1') {
           this.contractNumType = 1
+          this.contractValue = 4
           this.dialogVisible2 = false
           this.contractNum = []
           initPurchaseOrder().then(response => {
@@ -527,6 +528,7 @@ export default {
       unLinkGroup(this.contractNumValue).then(response => {
         if (response.data[0].result === '1') {
           this.contractNumType = 0
+          this.contractValue = 1
           this.$message.success('转换成功')
         } else {
           this.$message.success('转换失败')
@@ -788,17 +790,21 @@ export default {
             } else { this.$message.error('生成合同失败') }
           })
         } else {
-          for (let i = 0; i < this.contractNum.length; i++) {
+          if (this.contractValue === 4) {
-            if (this.contractNum[i].value === this.contractNumValue) {
+            for (let i = 0; i < this.contractNum.length; i++) {
-              this.RequisitionNumber = this.contractNum[i].label
+              if (this.contractNum[i].value === this.contractNumValue) {
+                this.RequisitionNumber = this.contractNum[i].label
+              }
             }
+            doneContract1(this.contractNumValue, this.RequisitionNumber, this.contractName, this.stipulateArrivalTime, this.form3.groupNumValue, this.id, this.supplierValue, this.textArea, this.contractValue, this.freight, this.AdvanceCharge, this.tableData5[0].数量, this.tableData5[0].单价, this.taxRate, this.currencyValue, this.tableData5[0].备注).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('生成合同成功')
+                this.reload()
+              } else { this.$message.error('生成合同失败') }
+            })
+          } else {
+            this.$message.warning('请将模板类型选择为成组采购')
           }
-          doneContract1(this.contractNumValue, this.RequisitionNumber, this.contractName, this.stipulateArrivalTime, this.form3.groupNumValue, this.id, this.supplierValue, this.textArea, this.contractValue, this.freight, this.AdvanceCharge, this.tableData5[0].数量, this.tableData5[0].单价, this.taxRate, this.currencyValue, this.tableData5[0].备注).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('生成合同成功')
-              this.reload()
-            } else { this.$message.error('生成合同失败') }
-          })
         }
       }
     },

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -52,7 +52,7 @@
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票金额" align="center" min-width="70">
+        <el-table-column label="发票金额(元)" align="center" min-width="110">
           <template slot-scope="scope">
             {{ scope.row.发票金额 }}
           </template>
@@ -64,7 +64,7 @@
         </el-table-column>
         <el-table-column label="申请时间" prop="申请时间" align="center" width="130">
           <template slot-scope="scope">
-            {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
+            {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
         <el-table-column label="采购审批" prop="审批人1姓名" align="center" width="100">

src/views/WorkshopProcurement/NewArrivalList/index.vue

@@ -1154,6 +1154,7 @@ export default {
       for (let i = 0; i < val.length; i++) {
         this.totalWight += val[i].到货重量
       }
+      console.log(this.totalWight, 111)
       this.arrest = val
     },
     // 选入

src/views/WorkshopProcurement/ProcurementContractApproval/index.vue

@@ -37,11 +37,6 @@
             {{ scope.row.采购合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="规定到货时间" align="center">
-          <template slot-scope="scope">
-            {{ scope.row.规定到货时间 }}
-          </template>
-        </el-table-column>
         <el-table-column label="供应商" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}

src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue

@@ -165,28 +165,28 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="合同总额" align="center" width="100" prop="合同总额">
+        <el-table-column label="合同总额(元)" align="center" width="110" prop="合同总额">
           <template slot-scope="scope">
             {{ scope.row.含税总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="已付金额" align="center" min-width="100" prop="已付金额">
+        <el-table-column label="已付金额(元)" align="center" min-width="100" prop="已付金额">
           <template slot-scope="scope">
             {{ scope.row.已付金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请中金额" align="center" min-width="100" prop="申请中金额">
+        <el-table-column label="申请中金额(元)" align="center" min-width="100" prop="申请中金额">
           <template slot-scope="scope">
             {{ scope.row.申请中金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+        <el-table-column label="请款金额(元)" align="center" min-width="130" prop="请款金额">
           <template slot-scope="scope">
             <el-input-number :max="scope.row.含税总金额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.含税总金额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" controls-position="right" size="mini" style="width: 100%;"/>
           </template>
         </el-table-column>
       </el-table>
-      <span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 80px; margin: 10px 10px 0 10px"/>元</span>
+      <span>合计：<el-input v-model="SUM" readonly size="mini" style="width: 120px; margin: 10px 10px 0 10px"/>元</span>
       <el-button type="primary" size="small" style="float:right;margin: 10px" icon="el-icon-check" @click="submitRequestFund">确定请款</el-button>
     </el-dialog>
   </div>