内贸修改

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -9,25 +9,25 @@
       </div>
       <div class="add-customer-btn">
         <el-button
-          v-if="detailData.seeDisabled"
+          v-if="detailData.seeDisabled && !detailData.opDisabled"
           size="small"
           @click="detailData.seeDisabled = false"
           type="primary"
           style="margin-right: 8px"
         >编辑</el-button>
-        <el-dropdown style="margin-right: 8px;">
-          <el-button
-            type="primary"
-            size="small"
-          >
-            审核处理<i class="el-icon-arrow-down el-icon--right"></i>
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item :disabled="!form.id || form.status > 0" @click.native="pleaseCheck">请核数据</el-dropdown-item>
-            <el-dropdown-item v-if="form.status > 0" @click.native="checkScheduleDialog = true,checkId=form.id">审核进度</el-dropdown-item>
-            <el-dropdown-item v-if="false">撤销请核</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+<!--        <el-dropdown style="margin-right: 8px;">-->
+<!--          <el-button-->
+<!--            type="primary"-->
+<!--            size="small"-->
+<!--          >-->
+<!--            审核处理<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+<!--          </el-button>-->
+<!--          <el-dropdown-menu slot="dropdown">-->
+<!--            <el-dropdown-item :disabled="!form.id || form.status > 0" @click.native="pleaseCheck">请核数据</el-dropdown-item>-->
+<!--            <el-dropdown-item v-if="form.status > 0" @click.native="checkScheduleDialog = true,checkId=form.id">审核进度</el-dropdown-item>-->
+<!--            <el-dropdown-item v-if="false">撤销请核</el-dropdown-item>-->
+<!--          </el-dropdown-menu>-->
+<!--        </el-dropdown>-->
         <el-dropdown style="margin-right: 8px;">
           <el-button
             type="warning"
@@ -92,11 +92,11 @@
                 <!--                <avue-input-tree v-if="item.prop === 'corpsTypeId'"  leaf-only multiple :props="{label:'title'}" v-model="form[item.prop]" placeholder="请选择内容" type="tree" :dic="dic"-->
                 <!--                ></avue-input-tree>-->
                 <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]"
-                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="detailData.seeDisabled || browse"/>
+                                size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="detailData.seeDisabled"/>
                 <el-date-picker v-else-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]"
                                 size="small" type="date" placeholder="选择日期"
-                                :disabled="detailData.seeDisabled || browse"/>
-                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled || browse">
+                                :disabled="detailData.seeDisabled"/>
+                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in paymentOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
                 <crop-select
@@ -104,7 +104,7 @@
                   v-model="form[item.prop]"
                   corpType="GYS"
                   @getCorpData="returnBack"
-                  :disabled="detailData.seeDisabled || browse"
+                  :disabled="detailData.seeDisabled"
                 ></crop-select>
                 <el-select v-else-if="item.prop === 'banks'"
                            v-model="form[item.prop]" placeholder="请选择"
@@ -115,7 +115,7 @@
                            size="small"
                            style="width: 100%;"
                            @change="banksChange"
-                           :disabled="detailData.seeDisabled || browse">
+                           :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in bankList" :key="index" :label="item.accountNo" :value="item.accountNo"></el-option>
                 </el-select>
                 <el-input
@@ -123,14 +123,14 @@
                   placeholder="请输入"
                   v-input-limit="2"
                   size="small"
-                  :disabled="item.disabled || detailData.seeDisabled || browse"
+                  :disabled="item.disabled || detailData.seeDisabled"
                   v-model.trim="form[item.prop]"
                 />
-                <el-select v-else-if="item.prop === 'packageRemarks'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled || browse">
+                <el-select v-else-if="item.prop === 'packageRemarks'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
                   <el-option v-for="(item,index) in packageOptions" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
-                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled || browse"></el-input>
-                <el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled || browse" placeholder="请输入"></el-input>
+                <el-input type="textarea" v-else-if="item.type === 'textarea'" v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled"></el-input>
+                <el-input type="age" v-else v-model.trim="form[item.prop]" size="small" autocomplete="off" :disabled="item.disabled || detailData.seeDisabled" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -203,7 +203,7 @@
                   type="text"
                   size="small"
                   @click="rowCell(row,index)"
-                  :disabled="detailData.seeDisabled || browse"
+                  :disabled="detailData.seeDisabled"
               >{{ row.$cellEdit ? '保存' : '修改' }}
               </el-button>
               <el-button
@@ -211,7 +211,7 @@
                 icon="el-icon-delete"
                 type="text"
                 @click="rowDel(row, index)"
-                :disabled="detailData.seeDisabled || browse"
+                :disabled="detailData.seeDisabled"
                 v-if="!row.$cellEdit"
               >删 除</el-button>
             </template>
@@ -220,13 +220,13 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="commoditySelection"
-                         :disabled="detailData.seeDisabled || browse"
+                         :disabled="detailData.seeDisabled"
               >录入明细
               </el-button>
               <el-button type="warning"
                          icon="el-icon-plus"
                          size="small"
-                         :disabled="selection.length < 1 || detailData.seeDisabled || form.status != 3"
+                         :disabled="selection.length < 1 || detailData.seeDisabled"
                          @click="getShipmentC">生成采购确认
               </el-button>
               <el-button type="info" :size="size" icon="el-icon-printer" @click.stop="openReport()">报 表</el-button>
@@ -236,7 +236,7 @@
         <fee-info
           ref="feeInfo"
           :orderFeesList="advantageProjectData"
-          :disabled="detailData.seeDisabled || form.status < 3"
+          :disabled="detailData.seeDisabled"
           feeUrl="/trade-purchase/purchase-order/removeByFees"
           optionType="GN"
           itemType="采购"
@@ -324,7 +324,7 @@
                 icon="el-icon-plus"
                 size="small"
                 @click.stop="$refs.uploadCrud.rowAdd()"
-                :disabled="detailData.seeDisabled || browse"
+                :disabled="detailData.seeDisabled"
               >上传</el-button
               >
             </template>
@@ -334,7 +334,7 @@
                 icon="el-icon-edit"
                 type="text"
                 @click="$refs.uploadCrud.rowEdit(row, index)"
-                :disabled="detailData.seeDisabled || browse"
+                :disabled="detailData.seeDisabled"
               >编 辑</el-button
               >
               <el-button
@@ -342,7 +342,7 @@
                 icon="el-icon-delete"
                 type="text"
                 @click="rowDelBankOfDeposit(row, index)"
-                :disabled="detailData.seeDisabled || browse"
+                :disabled="detailData.seeDisabled"
               >删 除</el-button
               >
             </template>
@@ -1524,6 +1524,7 @@ export default {
           this.saveLoading = true
           this.form.billType = 'CG'
           this.$set(this.form, 'tradeType', 'GN')
+          this.form.id && this.unLock({moduleName: 'cg',tableName: 'order', billId: this.form.id})
           typeSave(this.form).then(res => {
             this.$message({type: "success", message: this.form.id ? "修改成功!" : "新增成功!"});
             // this.saveLoading = false

src/views/businessManagement/purchaseOrder/index.vue

@@ -295,11 +295,33 @@ export default {
       this.$store.commit("DOMCG_IN_DETAIL");
     },
     editOpen(row, index) {
-      this.detailData = {
-        id: row.id,
-      };
-      this.isShow = false;
-      this.$store.commit("DOMCG_IN_DETAIL");
+      const data = {
+        moduleName: 'cg',
+        tableName: 'order',
+        billId: row.id,
+        no: 87654567
+      }
+      this.checkLock(data).then(res => {
+        if (res.data.code == 200) {
+          this.onLock(data).then(response => {
+            console.log(response)
+          })
+          this.detailData = {
+            id: row.id,
+          };
+          this.isShow = false;
+          this.$store.commit("DOMCG_IN_DETAIL");
+        }
+      }).catch(err => {
+        console.log(JSON.stringify(err.message))
+        this.detailData = {
+          id: row.id,
+          seeDisabled: true,
+          opDisabled: true
+        };
+        this.isShow = false;
+        this.$store.commit("DOMCG_IN_DETAIL");
+      })
     },
     // 复制新单
     copyOrder() {

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -14,6 +14,11 @@
           @click="detailData.seeDisabled = false"
           type="primary"
         >编辑</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :disabled="!form.id"
+                   @click="postMessage"
+        >发送消息</el-button>
         <el-button
           class="el-button--small-yh"
           type="primary"
@@ -356,6 +361,11 @@
                      :disabled="tableDataCost.length !== 1">导入</el-button>
         </span>
     </el-dialog>
+    <messagePost
+      v-if="messageVisble"
+      ref="messagePost"
+      @closeDialog="closeDialog"
+    ></messagePost>
   </div>
 </template>
 
@@ -707,6 +717,7 @@ export default {
       pageLoading: false,
       // 收货禁用
       receiveDisabled: false,
+      messageVisble:false,
     }
   },
   mounted() {
@@ -1261,7 +1272,7 @@ export default {
           }
           if (contrastObj(this.form, this.oldForm) ||
             contrastList(this.contactsData, this.oldGoodsList) ||
-            contrastList(this.advantageProjectData, this.oldFeesList) ||
+            // contrastList(this.advantageProjectData, this.oldFeesList) ||
             contrastList(this.bankOfDepositData, this.oldUploadList)
           ) {
             this.$confirm("数据发生变化未有提交记录, 是否保存?", "提示", {
@@ -1374,7 +1385,7 @@ export default {
     backToList() {
       if (contrastObj(this.form, this.oldForm) ||
         contrastList(this.contactsData, this.oldGoodsList) ||
-        contrastList(this.advantageProjectData, this.oldFeesList) ||
+        // contrastList(this.advantageProjectData, this.oldFeesList) ||
         contrastList(this.bankOfDepositData, this.oldUploadList)
       ) {
         this.$confirm("数据发生变化未有提交记录, 是否提交?", "提示", {
@@ -1435,6 +1446,16 @@ export default {
       params.srcOrderno = this.form.orderNo
       callback(params)
     },
+    // 发送消息
+    postMessage() {
+      this.messageVisble = true
+      this.$nextTick(() => {
+        this.$refs.messagePost.init()
+      })
+    },
+    closeDialog() {
+      this.messageVisble = false
+    },
   }
 }
 </script>

src/views/businessManagement/salesOrder/index.vue

@@ -104,6 +104,7 @@ import {customerList, typeSave, deleteDetails, saveSell,detail} from "@/api/basi
 import detailPage from "./detailsPageEdit";
 import search from "../../../page/index/search";
 import { defaultDate } from "@/util/date";
+import os from "os";
 
 export default {
   name: "customerInformation",
@@ -142,6 +143,36 @@ export default {
     }
   },
   async created() {
+    const os = require("os")
+    const cpus = os.cpus();
+    console.log(os)
+    console.log(os.cpus())
+    cpus.forEach((cpu,idx,arr)=>{
+      var times = cpu.times;
+      console.log(cpu)
+      console.log(`cpu${idx}：`);
+      console.log(`型号：${cpu.model}`);
+      console.log(`频率：${cpu.speed}MHz`);
+      console.log(`使用率：${((1-times.idle/(times.idle+times.user+times.nice+times.sys+times.irq))*100).toFixed(2)}%`);
+    });
+
+    const getIP = () => {
+      const interfaces = os.networkInterfaces();
+      console.log('interfaces:', interfaces)
+      for (let devName in interfaces) {
+        const iface = interfaces[devName];
+        console.log('iface:', iface)
+        for (let i = 0; i < iface.length; i++) {
+          const alias = iface[i];
+          console.log('alias:', alias)
+          if (alias.family === 'IPv4' && alias.address !== '127.0.0.1' && !alias.internal && alias.netmask === '255.255.255.0') {
+            return alias.address;
+          }
+        }
+      }
+    }
+    console.log(getIP())
+
     this.search.businesDate = defaultDate(1)
     // this.option = option
     this.option = await this.getColumnData(this.getColumnName(14), option);