1233

api/app/service/dingdan.js

@@ -40,7 +40,7 @@ class DingdanService extends Service {
       let chanpinItemB = await chanpinModel.find({ xiangtiaoxingma: updateItem.tiaoma })
       let chanpinItemC = await chanpinModel.find({ zuidaxiangzhuangtiaoma: updateItem.tiaoma })
       if (chanpinItemA.length || chanpinItemB.length || chanpinItemC.length) {
-        updateItem = { ...updateItem, isNotSale: false }
+        updateItem = { ...updateItem }
         let res = await modelLocal.updateOne({ _id: updateItem._id }, updateItem)
         returnData.hasError = false
         returnData.msg = "数据更新成功"
@@ -186,8 +186,11 @@ class DingdanService extends Service {
         item["chanpindaima"] = _.get(chanpinItemC, [0, "daima"], "")
         item["zuixiaodanweitiaoma"] = _.get(chanpinItemC, [0, "tiaoxingma"], "")
         item["xiaoshoushuliang"] = item.xiaoshoushuliang
-        let zuidadanweixiangzhuangliang = Number((_.get(chanpinItemC, [0, "zuidadanweixiangzhuangliang"], 1) || 1))
+        let guigexinghao = _.get(chanpinItemC, [0, "guigexinghao"], "")
-        item["xiugaihouxiaoshoushuliang"] = item.xiaoshoushuliang * zuidadanweixiangzhuangliang
+        let guigexinghaoArr = _.split(guigexinghao, "*")
+        let jishu = Number(guigexinghaoArr[2]) * Number(guigexinghaoArr[1])
+        // let zuidadanweixiangzhuangliang = Number((_.get(chanpinItemC, [0, "zuidadanweixiangzhuangliang"], 1) || 1))
+        item["xiugaihouxiaoshoushuliang"] = item.xiaoshoushuliang * Number(jishu)
         item["xiaoshoujine"] = item.xiaoshoujine
         item["zuigaocaigoujia"] = _.get(chanpinItemC, [0, "zuigaocaigoujia"], 0)
         item["xiangzhuangliang"] = _.get(chanpinItemC, [0, "xiangzhuangliang"], 0)

front/src/main/index.js

@@ -10,7 +10,7 @@ function createWindow() {
   mainWindow = new BrowserWindow({
     // fullscreen: true,
     // fullscreenable: true,
-    width: 1280,
+    width: 1580,
     height: 800,
     // width:1080,
     // height:1920,

front/src/renderer/src/assets/json/dingdan.json

@@ -144,13 +144,6 @@
     "formShow": true,
     "exportxiaoshou": true
   },
-  {
-    "label": "条码",
-    "prop": "tiaoma",
-    "type": "text",
-    "formShow": true,
-    "tableShow": true
-  },
   {
     "label": "品名",
     "prop": "pinming",
@@ -197,10 +190,10 @@
     "exportxiaoshou": true
   },
   {
-    "label": "是否有售卖",
+    "label": "暂无此产品",
     "prop": "isNotSale",
-    "type": "number",
+    "type": "boolean",
-    "formShow": false,
+    "formShow": true,
     "tableShow": true
   }
 ]

front/src/renderer/src/components/dingdanformcomponent.vue

@@ -6,7 +6,7 @@
           <el-input v-model="formData[formItem.prop]" />
         </template>
         <template v-else-if="formItem.type === 'select'">
-          <el-select v-model="formData[formItem.prop]" :placeholder="`请选择${formItem.label}`" style="width: 240px" >
+          <el-select v-model="formData[formItem.prop]" :placeholder="`请选择${formItem.label}`" style="width: 240px">
             <el-option v-for="item in formData[formItem.prop + 'xuanxiang']" :key="item.value" :label="item.label"
               :value="item.value" />
           </el-select>
@@ -28,6 +28,9 @@
         <template v-else-if="formItem.type === 'date'">
           <el-date-picker v-model="formData[formItem.prop]" type="date" :placeholder="`请选择${formItem.label}`" />
         </template>
+        <template v-else-if="formItem.type === 'boolean'">
+          <el-switch v-model="formData[formItem.prop]" active-text="是" inactive-text="否" />
+        </template>
       </el-form-item>
     </el-form>
   </div>

front/src/renderer/src/components/dingdantablecomponent.vue

@@ -21,6 +21,9 @@
           <template v-else-if="headerItem.type === 'number'">
             <span>{{ scope.row[headerItem.prop] }}</span>
           </template>
+          <template v-else-if="headerItem.type === 'boolean'">
+            <span>{{ scope.row[headerItem.prop] ? "是" : "否" }}</span>
+          </template>
           <template v-else>{{ scope.row[headerItem.prop] }}</template>
         </template>
       </el-table-column>

front/src/renderer/src/views/dingdan.vue

@@ -37,13 +37,13 @@
         <span>刷新</span>
       </el-button>
       <el-button type="primary" @click="clickColor('blue')" color="#a0cfff">
-        <span>蓝色</span>
+        <span>未售卖</span>
       </el-button>
       <el-button type="primary" @click="clickColor('red')" color="#fab6b6">
-        <span>红色</span>
+        <span>低于采购价</span>
       </el-button>
       <el-button type="primary" @click="clickColor('yellow')" color="#f3d19e">
-        <span>黄色</span>
+        <span>多个产品</span>
       </el-button>
       <el-button type="primary" @click="exportxiaoshoudata">
         <el-icon>